Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 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 | eef752151556 |
| children | 0932bc2fb2be b65773f7db41 0fc4b1ab57e3 |
comparison
equal
deleted
inserted
replaced
| 829:764b0350acb8 | 830:ca080d28d0af |
|---|