Thu, 04 Aug 2005 13:31:25 -0800 |
mpm |
Merge with BOS
|
Thu, 04 Aug 2005 13:27:41 -0800 |
mpm |
Merge with TAH
|
Thu, 04 Aug 2005 17:43:05 +0100 |
Thomas Arendsen Hein |
Cleaned up trap handling:
|
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.
|
Thu, 04 Aug 2005 17:16:41 +0100 |
Thomas Arendsen Hein |
Shortened hgmerge a little bit.
|
Thu, 04 Aug 2005 16:56:44 +0100 |
Thomas Arendsen Hein |
Hide error message of type command.
|
Sat, 30 Jul 2005 09:00:14 -0800 |
mpm |
Merge with BOS
|
Sat, 30 Jul 2005 08:35:29 -0800 |
mpm |
Merge with TAH
|