| Tue, 25 Feb 2014 20:30:08 +0100 |
Mads Kiilerich |
merge: use ancestor filename from planning phase instead of filectx ancestor
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
| Wed, 30 Jan 2013 19:29:36 +0100 |
Mads Kiilerich |
merge: fix UnboundLocalError (issue3791)
stable
|
| Wed, 09 Jan 2013 02:02:45 +0100 |
Mads Kiilerich |
merge: merge file flags together with file content
|
| Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
tests: better test coverage of merges of flags
|
| Thu, 10 Jan 2013 00:44:23 +0100 |
Mads Kiilerich |
merge: changing the mode of a file is also an update
|
| Thu, 05 Jul 2012 00:35:42 +0200 |
Mads Kiilerich |
tests: fix test markup in test-merge-types.t
|
| Wed, 04 Apr 2012 11:18:42 +0200 |
Thomas Arendsen Hein |
test-merge-types: allow different output with existing hgmerge (issue3346)
stable
|
| Tue, 13 Mar 2012 16:28:08 -0500 |
Matt Mackall |
merge: handle linear update to symlink correctly (issue3316)
stable
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
| Mon, 07 Nov 2011 03:14:54 +0100 |
Mads Kiilerich |
tests: use 'hghave execbit' for tests that manipulate x bit in file system
|
| Mon, 07 Nov 2011 03:14:54 +0100 |
Mads Kiilerich |
tests: use 'hghave symlink' for tests using symlinks
|
| Tue, 14 Sep 2010 12:20:51 +0200 |
Adrian Buehlmann |
combine tests
base
tests/test-merge-types@79b11a6f7640
|
