hgmerge
Sun, 29 Jan 2006 10:10:00 +1300 Christian Ebert Use of opendiff as merge program on MacOS X
Mon, 24 Oct 2005 14:55:53 -0700 levon Fix use of diff(1) triggered by set -e.
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
Fri, 29 Jul 2005 14:51:41 +0100 Thomas Arendsen Hein Remove usage of ${par:-word}, which and mktemp. Quote filenames.
Thu, 30 Jun 2005 23:28:16 -0800 mpm Merge with TAH
Fri, 01 Jul 2005 07:22:27 +0100 Thomas Arendsen Hein Remove bashisms and use /bin/sh instead of /bin/bash.
Fri, 10 Jun 2005 09:36:38 -0800 mpm Merge with TAH
Fri, 10 Jun 2005 07:52:39 +0100 Thomas Arendsen Hein Use vi if $EDITOR is unset.
Fri, 10 Jun 2005 07:50:20 +0100 Thomas Arendsen Hein Check if $DISPLAY is set before using tkdiff or kdiff3.
Wed, 08 Jun 2005 10:52:01 -0800 mpm Mark the usual things executable
Fri, 03 Jun 2005 18:42:53 -0800 mpm hgmerge: use diff3 if available
Fri, 03 Jun 2005 18:27:55 -0800 mpm Replace tkmerge with hgmerge
less more (0) tip