| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
| Fri, 21 Mar 2008 11:06:02 +0100 |
Dirkjan Ochtman |
warn about new heads on commit (issue842)
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: allow smarter tool configuration
|
| Mon, 14 Jan 2008 16:28:32 -0600 |
Matt Mackall |
merge: add a bit more sanity to divergent copy checks
|
| Mon, 31 Dec 2007 17:47:02 -0600 |
Matt Mackall |
Backed out changeset c2a21fe60994
|
| Sun, 30 Dec 2007 17:45:26 +0100 |
Thomas Arendsen Hein |
"C" status code considered harmful, so changed to "=" (issue899)
|
| Thu, 04 Oct 2007 19:44:37 -0500 |
Matt Mackall |
merge: add debug diagnostics for findcopies
|
| Wed, 01 Aug 2007 12:33:12 -0500 |
Matt Mackall |
merge: do early copy to deal with issue636
|
| Thu, 21 Jun 2007 18:02:03 -0500 |
Matt Mackall |
merge: warn user about divergent renames
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: report destinations of moves in merge action messages
|
| Wed, 15 Nov 2006 15:51:58 -0600 |
Matt Mackall |
refactor debugrenamed
|
| 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
|
| Tue, 10 Oct 2006 00:41:55 -0500 |
Matt Mackall |
merge: unify merge and copy actions
|
| Mon, 09 Oct 2006 21:27:04 -0500 |
Matt Mackall |
filemerge: use contexts rather than my and other
|
| Sun, 08 Oct 2006 19:57:45 -0500 |
Matt Mackall |
merge: remember rename copies and parents properly on commit
|
| Fri, 06 Oct 2006 16:55:11 -0500 |
Matt Mackall |
merge: copy fixes and tests
|
| Wed, 04 Oct 2006 19:08:04 -0500 |
Matt Mackall |
merge: fixes for merge+rename
|
| Mon, 25 Sep 2006 16:45:31 -0500 |
Matt Mackall |
Add core copy detection algorithm
|
