| 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 |
| Fri, 10 Mar 2006 22:24:19 -0800 | Vadim Gelfer | fix broken environment save/restore when a hook runs. | file | diff | annotate |
| Thu, 23 Feb 2006 18:10:04 +0100 | Radoslaw Szkodzinski | hgmerge: do not use file with markers in tools merging themselves | file | diff | annotate |
| Thu, 23 Feb 2006 14:42:47 +0100 | Thomas Arendsen Hein | Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work. | file | diff | annotate |
| Tue, 21 Feb 2006 15:48:22 -0600 | Radoslaw Szkodzinski | hgmerge: add meld support | file | diff | annotate |
| Tue, 21 Feb 2006 15:48:19 -0600 | Radoslaw Szkodzinski | hgmerge: improve "apps not found" message | file | diff | annotate |
| Tue, 21 Feb 2006 15:48:16 -0600 | Radoslaw Szkodzinski | hgmerge: logic changes | file | diff | annotate |
| Tue, 21 Feb 2006 15:48:12 -0600 | Radoslaw Szkodzinski | hgmerge: add and use ask_if_merged function | file | diff | annotate |
| Tue, 21 Feb 2006 15:48:09 -0600 | Radoslaw Szkodzinski | hgmerge: fix diff+patch detection; cleanups | file | diff | annotate |
| Mon, 06 Feb 2006 17:32:10 -0600 | Radoslaw Szkodzinski | hgmerge: various cleanups | file | diff | annotate |
| Mon, 06 Feb 2006 17:32:06 -0600 | Radoslaw Szkodzinski | hgmerge: add cleanup functions | file | diff | annotate |
| Mon, 06 Feb 2006 17:32:00 -0600 | Radoslaw Szkodzinski | hgmerge: add and use more tool variables | file | diff | annotate |
| Mon, 30 Jan 2006 12:02:12 +1300 | Brendan Cully | Safer version of FileMerge merge | file | diff | annotate |
| Sun, 29 Jan 2006 10:10:00 +1300 | Christian Ebert | Use of opendiff as merge program on MacOS X | file | diff | annotate |
| Mon, 24 Oct 2005 14:55:53 -0700 | levon | Fix use of diff(1) triggered by set -e. | file | diff | annotate |
| Thu, 04 Aug 2005 13:31:25 -0800 | mpm | Merge with BOS | file | diff | annotate |
| Thu, 04 Aug 2005 13:27:41 -0800 | mpm | Merge with TAH | file | diff | annotate |
| Thu, 04 Aug 2005 17:43:05 +0100 | Thomas Arendsen Hein | Cleaned up trap handling: | file | diff | annotate |
| 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. | file | diff | annotate |
| Thu, 04 Aug 2005 17:16:41 +0100 | Thomas Arendsen Hein | Shortened hgmerge a little bit. | file | diff | annotate |
| Thu, 04 Aug 2005 16:56:44 +0100 | Thomas Arendsen Hein | Hide error message of type command. | file | diff | annotate |
| Sat, 30 Jul 2005 09:00:14 -0800 | mpm | Merge with BOS | file | diff | annotate |
| Sat, 30 Jul 2005 08:35:29 -0800 | mpm | Merge with TAH | file | diff | annotate |
| Fri, 29 Jul 2005 14:51:41 +0100 | Thomas Arendsen Hein | Remove usage of ${par:-word}, which and mktemp. Quote filenames. | file | diff | annotate |
| Thu, 30 Jun 2005 23:28:16 -0800 | mpm | Merge with TAH | file | diff | annotate |
| Fri, 01 Jul 2005 07:22:27 +0100 | Thomas Arendsen Hein | Remove bashisms and use /bin/sh instead of /bin/bash. | file | diff | annotate |
| Fri, 10 Jun 2005 09:36:38 -0800 | mpm | Merge with TAH | file | diff | annotate |
| Fri, 10 Jun 2005 07:52:39 +0100 | Thomas Arendsen Hein | Use vi if $EDITOR is unset. | file | diff | annotate |
| Fri, 10 Jun 2005 07:50:20 +0100 | Thomas Arendsen Hein | Check if $DISPLAY is set before using tkdiff or kdiff3. | file | diff | annotate |
| Wed, 08 Jun 2005 10:52:01 -0800 | mpm | Mark the usual things executable | file | diff | annotate |
| Fri, 03 Jun 2005 18:42:53 -0800 | mpm | hgmerge: use diff3 if available | file | diff | annotate |
| Fri, 03 Jun 2005 18:27:55 -0800 | mpm | Replace tkmerge with hgmerge | file | diff | annotate |