hgmerge
Fri, 07 Apr 2006 22:31:54 +0200 Radoslaw Szkodzinski Try to use /usr/bin/test or /bin/test to work around missing features. 0.8.1
Sat, 11 Mar 2006 21:33:19 -0800 Vadim Gelfer run merge program in repo root.
Fri, 10 Mar 2006 23:34:36 -0800 Vadim Gelfer merge with self.
Fri, 10 Mar 2006 23:34:02 -0800 Vadim Gelfer give more info to hgmerge script.
Fri, 10 Mar 2006 23:25:50 -0800 Vadim Gelfer undo edit that was accident.
Fri, 10 Mar 2006 22:24:19 -0800 Vadim Gelfer fix broken environment save/restore when a hook runs.
Thu, 23 Feb 2006 18:10:04 +0100 Radoslaw Szkodzinski hgmerge: do not use file with markers in tools merging themselves
Thu, 23 Feb 2006 14:42:47 +0100 Thomas Arendsen Hein Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
Tue, 21 Feb 2006 15:48:22 -0600 Radoslaw Szkodzinski hgmerge: add meld support
Tue, 21 Feb 2006 15:48:19 -0600 Radoslaw Szkodzinski hgmerge: improve "apps not found" message
Tue, 21 Feb 2006 15:48:16 -0600 Radoslaw Szkodzinski hgmerge: logic changes
Tue, 21 Feb 2006 15:48:12 -0600 Radoslaw Szkodzinski hgmerge: add and use ask_if_merged function
Tue, 21 Feb 2006 15:48:09 -0600 Radoslaw Szkodzinski hgmerge: fix diff+patch detection; cleanups
Mon, 06 Feb 2006 17:32:10 -0600 Radoslaw Szkodzinski hgmerge: various cleanups
Mon, 06 Feb 2006 17:32:06 -0600 Radoslaw Szkodzinski hgmerge: add cleanup functions
less more (0) -15 tip