| Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
change tests to use simplemerge by default
|
| Tue, 10 Oct 2006 02:15:20 -0500 |
Matt Mackall |
merge: various tidying
|
| Tue, 10 Oct 2006 01:16:06 -0500 |
Matt Mackall |
merge: shortcircuit filemerge for identical files
|
| Mon, 09 Oct 2006 21:27:04 -0500 |
Matt Mackall |
filemerge: use contexts rather than my and other
|
| Mon, 02 Oct 2006 12:04:48 -0500 |
Matt Mackall |
merge: extend file merge function for renames
|
| Sun, 17 Sep 2006 21:27:30 -0500 |
Matt Mackall |
merge: simplify actions with helper function
|
| Sun, 17 Sep 2006 17:13:02 -0500 |
Matt Mackall |
merge: remove linear variable
|
| Tue, 22 Aug 2006 19:32:16 -0500 |
Matt Mackall |
merge: use context code to retrieve manifests
|
| Wed, 09 Aug 2006 13:55:18 -0500 |
Matt Mackall |
Merge with crew, fix most tests
|
| Sun, 14 May 2006 21:07:34 -0700 |
Vadim Gelfer |
deprecate 'update -m'. use 'merge' instead.
|
| Tue, 02 May 2006 18:44:02 +0200 |
Thomas Arendsen Hein |
Make hg update more verbose by default (issue12)
|
| Wed, 29 Mar 2006 10:27:16 -0800 |
Vadim Gelfer |
add merge command. means same thing as "update -m".
|
| 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.
|
| Mon, 13 Mar 2006 08:56:59 +0100 |
Benoit Boissinot |
ui: output the number of file updated/merged/removed/... on update
|
| Tue, 27 Sep 2005 14:53:11 -0700 |
Matt Mackall |
Make test-merge7 repeatable
|
| Mon, 26 Sep 2005 16:52:47 -0700 |
Matt Mackall |
Repair ancestor logic, fix up test cases
|
