| Thu, 14 May 2009 16:03:17 +0200 |
Dirkjan Ochtman |
merge: add -S/--show option to review revisions without merging
|
| Sun, 12 Oct 2008 19:11:59 +0200 |
Patrick Mezard |
tests: Windows compatibility fixes
|
| Tue, 27 Mar 2007 01:41:17 -0300 |
Alexis S. L. Carvalho |
test-merge1: avoid a shell script
|
| Tue, 26 Dec 2006 14:17:48 +0100 |
Thomas Arendsen Hein |
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
|
| Wed, 11 Oct 2006 16:35:09 +0200 |
Benoit Boissinot |
fix traceback of extdiff after a merge
|
| Sun, 14 May 2006 21:07:34 -0700 |
Vadim Gelfer |
deprecate 'update -m'. use 'merge' instead.
|
| Mon, 13 Mar 2006 13:05:41 +0100 |
Thomas Arendsen Hein |
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
|
| Wed, 14 Dec 2005 22:19:03 -0600 |
Benoit Boissinot |
abort when merging two heads and repository has local changes
|
| Tue, 13 Sep 2005 18:38:27 -0500 |
mpm |
Fix bug with co -C across branches, update tests
|
| 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 15:19:43 +0100 |
Thomas Arendsen Hein |
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
|
| Thu, 21 Jul 2005 15:05:17 -0500 |
mpm |
Update tests to use commit -m and default -u
|
| Tue, 21 Jun 2005 21:07:08 -0800 |
mpm |
Fix up test-merge1
|
| Tue, 21 Jun 2005 18:41:57 -0800 |
mpm |
[PATCH] Merging identical changes from another branch
|
