| Mon, 19 Apr 2010 20:41:53 +0200 |
Benoit Boissinot |
filemerge: use working dir parent as ancestor for backward wdir merge
stable
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: allow merging going backwards
|
| Fri, 11 Apr 2008 12:52:56 -0500 |
Matt Mackall |
resolve: new command
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: allow smarter tool configuration
|
| Tue, 08 May 2007 11:42:48 -0500 |
Matt Mackall |
Merge with stable
|
| Tue, 08 May 2007 02:59:13 -0500 |
Matt Mackall |
merge: fix spurious merges for copies in linear updates
|
| Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
change tests to use simplemerge by default
|
| Thu, 05 Apr 2007 16:43:18 -0500 |
Matt Mackall |
merge: fix a bug where copies were ignored
|
| Mon, 11 Dec 2006 18:09:52 +0100 |
Thomas Arendsen Hein |
Add instructions how to redo/finish failed merge with local working directory.
|
