Mercurial > hg > mercurial-crew-with-dirclash
diff comparison.txt @ 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 | 17e66e1a0382 |
children | 2073e5a71008 |