Mercurial > hg > mercurial-crew-with-dirclash
diff hgeditor @ 830:ca080d28d0af
If rejects are empty after using the editor, merge with diff+patch was ok.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 17:23:31 +0100 |
parents | 0902ffece4b4 |
children | 232d0616a80a 1fe3b14c7044 9c918287d10b |