Thu, 04 Aug 2005 17:43:05 +0100 | Thomas Arendsen Hein | Cleaned up trap handling: | changeset | files |
Thu, 04 Aug 2005 17:23:31 +0100 | Thomas Arendsen Hein | If rejects are empty after using the editor, merge with diff+patch was ok. | changeset | files |
Thu, 04 Aug 2005 17:16:41 +0100 | Thomas Arendsen Hein | Shortened hgmerge a little bit. | changeset | files |