Mercurial > hg-stable
diff CONTRIBUTORS @ 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 | 73540173e14c |
children | 73a432c8040a c2e77581bc84 |