This commit is contained in:
Ian 2011-12-20 22:36:03 +00:00 committed by admin
parent cc88abd0ad
commit 58a89c243c

View file

@ -0,0 +1,3 @@
Sorry, but all this wiki and the manpage seem to gloss over the most obvious question:
What happens when you commit conflicting edits in different repositories?