| 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)
|
| Fri, 05 Oct 2007 12:30:19 -0700 |
Bryan O'Sullivan |
Update test for new output produced since 17ed9b9a0d03
|
| 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
|
| Tue, 08 May 2007 02:59:13 -0500 |
Matt Mackall |
merge: fix spurious merges for copies in linear updates
|
| Thu, 05 Apr 2007 16:43:18 -0500 |
Matt Mackall |
merge: fix a bug where copies were ignored
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: only store one direction of copies in the copy map
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: report destinations of moves in merge action messages
|
| Sat, 18 Nov 2006 11:34:19 -0600 |
Matt Mackall |
avoid unnecessary copy merges
|
| Sun, 15 Oct 2006 16:18:09 -0500 |
Matt Mackall |
merge: if filemerge skips merge, report as updated
|
| 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
|
| Sat, 07 Oct 2006 17:30:26 -0500 |
Matt Mackall |
Fix undetected change bug in rename tests
|
| Fri, 06 Oct 2006 17:14:50 -0500 |
Matt Mackall |
Update test output
|
| Fri, 06 Oct 2006 16:55:11 -0500 |
Matt Mackall |
merge: copy fixes and tests
|
