Wed, 15 Aug 2007 17:27:51 +0200 | Sascha Wilde | Use smerge minor mode in emacs to resolve conflicts. | file | diff | annotate |
Sun, 08 Jul 2007 13:44:41 +0200 | Thomas Arendsen Hein | Check for conflict markers in hgmerge (issue471) | file | diff | annotate |
Fri, 07 Apr 2006 22:31:54 +0200 | Radoslaw Szkodzinski | Try to use /usr/bin/test or /bin/test to work around missing features. | file | diff | annotate |
Sat, 11 Mar 2006 21:33:19 -0800 | Vadim Gelfer | run merge program in repo root. | file | diff | annotate |
Fri, 10 Mar 2006 23:34:36 -0800 | Vadim Gelfer | merge with self. | file | diff | annotate |
Fri, 10 Mar 2006 23:34:02 -0800 | Vadim Gelfer | give more info to hgmerge script. | file | diff | annotate |
Fri, 10 Mar 2006 23:25:50 -0800 | Vadim Gelfer | undo edit that was accident. | file | diff | annotate |