| Wed, 26 Dec 2007 22:47:16 +0100 |
Thomas Arendsen Hein |
Fix misleading error and prompts during update/merge (issue556)
|
| Wed, 01 Nov 2006 21:47:55 -0600 |
Matt Mackall |
Clarify untracked file merge message
|
| Sun, 15 Oct 2006 16:18:09 -0500 |
Matt Mackall |
merge: if filemerge skips merge, report as updated
|
| Wed, 11 Oct 2006 16:41:52 +0200 |
Benoit Boissinot |
merge with crew
|
| Wed, 11 Oct 2006 16:35:09 +0200 |
Benoit Boissinot |
fix traceback of extdiff after a merge
|
| Tue, 10 Oct 2006 01:16:06 -0500 |
Matt Mackall |
merge: shortcircuit filemerge for identical files
|
| Tue, 22 Aug 2006 17:08:38 -0500 |
Matt Mackall |
merge: simplify working dir manifest generation
|
| Tue, 02 May 2006 18:44:02 +0200 |
Thomas Arendsen Hein |
Make hg update more verbose by default (issue12)
|
| Fri, 24 Mar 2006 14:53:23 +0100 |
mcmillen |
Spelling fix: "commited" -> "committed"
|
| 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
|
| Tue, 16 Aug 2005 19:03:01 -0800 |
mpm |
run-tests: remove '+ hg' trick
|
| 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:21:02 +0100 |
Thomas Arendsen Hein |
Updated output of tests.
|
| 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
|
