| Thu, 17 Sep 2009 22:39:38 -0700 |
Stuart W Marks |
hg: say 'hg update' instead of 'hg up' in merge status message
|
file |
diff |
annotate
|
| Wed, 04 Mar 2009 13:06:16 -0600 |
Augie Fackler |
merge: better error messages to lead users to hg update --clean to abandon merges.
|
file |
diff |
annotate
|
| Fri, 11 Apr 2008 12:52:56 -0500 |
Matt Mackall |
resolve: new command
|
file |
diff |
annotate
|
| Fri, 21 Mar 2008 11:06:02 +0100 |
Dirkjan Ochtman |
warn about new heads on commit (issue842)
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: allow smarter tool configuration
|
file |
diff |
annotate
|
| Sat, 28 Apr 2007 17:55:45 -0300 |
Alexis S. L. Carvalho |
run-tests.py: pass -L/--label to simplemerge
|
file |
diff |
annotate
|
| Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
change tests to use simplemerge by default
|
file |
diff |
annotate
|
| Tue, 02 May 2006 18:44:02 +0200 |
Thomas Arendsen Hein |
Make hg update more verbose by default (issue12)
|
file |
diff |
annotate
|
| 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.
|
file |
diff |
annotate
|
| Tue, 16 Aug 2005 19:03:01 -0800 |
mpm |
run-tests: remove '+ hg' trick
|
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:21:02 +0100 |
Thomas Arendsen Hein |
Updated output of tests.
|
file |
diff |
annotate
|
| Thu, 21 Jul 2005 15:05:17 -0500 |
mpm |
Update tests to use commit -m and default -u
|
file |
diff |
annotate
|
| Thu, 21 Jul 2005 12:40:28 -0500 |
mpm |
Update test output for status change
|
file |
diff |
annotate
|
| Sat, 02 Jul 2005 22:54:35 -0800 |
mpm |
options: kill -d for debug
|
file |
diff |
annotate
|
| Fri, 17 Jun 2005 08:50:55 -0800 |
mpm |
Tidy up conflict and pull tests
|
file |
diff |
annotate
|
| Wed, 15 Jun 2005 21:13:49 -0800 |
mpm |
Merge with TAH
|
file |
diff |
annotate
|
| Wed, 15 Jun 2005 21:12:28 -0800 |
mpm |
update tests to reflect new short hash length
|
file |
diff |
annotate
|
| Wed, 15 Jun 2005 00:27:20 -0800 |
mpm |
merge3: fix argument order
|
file |
diff |
annotate
|