Mercurial > hg > mercurial-crew-with-dirclash
graph
-
If rejects are empty after using the editor, merge with diff+patch was ok.Thu, 04 Aug 2005 17:23:31 +0100, by Thomas Arendsen Hein
-
Shortened hgmerge a little bit.Thu, 04 Aug 2005 17:16:41 +0100, by Thomas Arendsen Hein