Wed, 14 Dec 2005 22:19:03 -0600 | Benoit Boissinot | abort when merging two heads and repository has local changes | file | diff | annotate |
Tue, 13 Sep 2005 18:38:27 -0500 | mpm | Fix bug with co -C across branches, update tests | 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 15:19:43 +0100 | Thomas Arendsen Hein | Don't use 'set -x', fix exports, sed and hexdump usage for Solaris. | file | diff | annotate |
Thu, 21 Jul 2005 15:05:17 -0500 | mpm | Update tests to use commit -m and default -u | file | diff | annotate |
Tue, 21 Jun 2005 21:07:08 -0800 | mpm | Fix up test-merge1 | file | diff | annotate |
Tue, 21 Jun 2005 18:41:57 -0800 | mpm | [PATCH] Merging identical changes from another branch | file | diff | annotate |