| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
file |
diff |
annotate
|
| Mon, 07 Dec 2015 20:43:24 -0800 |
Martin von Zweigbergk |
merge: refuse update/merge if there are unresolved conflicts (BC)
|
file |
diff |
annotate
|
| Sun, 22 Nov 2015 21:20:08 -0500 |
Matt Harbison |
test-resolve: fix '--tool f' invocation for Windows
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: handle additional record types specially
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 23:42:32 -0800 |
Siddharth Agarwal |
test-resolve.t: remove completely unnecessary line
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 17 Nov 2015 15:43:21 -0800 |
Siddharth Agarwal |
test-resolve.t: switch to mergestate.read()
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 21:12:13 -0500 |
Matt Harbison |
tests: fix globs for Windows
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 23:58:07 -0700 |
Siddharth Agarwal |
resolve: perform all premerges before performing any file merges (BC)
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 23:56:44 -0700 |
Siddharth Agarwal |
test-resolve.t: add some tests for .orig file contents
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 23:54:40 -0700 |
Siddharth Agarwal |
test-resolve.t: add some output to show order of operations
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Fri, 25 Sep 2015 03:51:46 -0400 |
timeless |
resolve: consistently describe re-merge + unresolved
|
file |
diff |
annotate
|
| Wed, 11 Feb 2015 13:59:13 +0900 |
Yuya Nishihara |
resolve: port to generic templater
|
file |
diff |
annotate
|
| Wed, 11 Feb 2015 13:47:43 +0900 |
Yuya Nishihara |
resolve: silence warning of unknown pats for -l/--list (BC)
|
file |
diff |
annotate
|
| Fri, 17 Oct 2014 11:01:05 -0400 |
Augie Fackler |
test-resolve.t: use redirection to /dev/null instead of grep -q
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 22:30:04 -0700 |
Martin von Zweigbergk |
resolve: run happily after conflict-free merge
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 22:16:18 -0700 |
Martin von Zweigbergk |
test-resolve: add tests for re-merge
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 22:19:08 -0700 |
Martin von Zweigbergk |
test-resolve: add more tests for in conflict-free states
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 21:07:30 -0700 |
Martin von Zweigbergk |
test-resolve: add test resolving one of two files
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 21:19:31 -0700 |
Martin von Zweigbergk |
test-resolve: clarify test descriptions and consistently use "should"
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
file |
diff |
annotate
|
| Mon, 09 Jun 2014 14:11:17 -0500 |
Matt Mackall |
resolve: fix grammar of no matching files message
|
file |
diff |
annotate
|
| Fri, 23 May 2014 13:10:31 -0700 |
Siddharth Agarwal |
resolve: don't abort resolve -l even when no merge is in progress
|
file |
diff |
annotate
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 18:56:26 -0700 |
Gregory Szorc |
resolve: print warning when no work performed (issue4208)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 19:08:32 -0700 |
Gregory Szorc |
resolve: abort when not applicable (BC)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 18:26:42 -0700 |
Gregory Szorc |
resolve: split test
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
file |
diff |
annotate
|
| Tue, 19 Oct 2010 22:33:52 -0500 |
Steve Borho |
merge: implement --tool arguments using new ui.forcemerge configurable
|
file |
diff |
annotate
|
| Thu, 16 Sep 2010 17:51:32 -0500 |
Matt Mackall |
tests: add exit codes to unified tests
|
file |
diff |
annotate
|
| Sun, 12 Sep 2010 18:05:53 -0500 |
Brodie Rao |
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
|
file |
diff |
annotate
|
| Mon, 30 Aug 2010 14:06:18 +0900 |
Nicolas Dumazet |
tests: unify test-resolve
|
file |
diff |
annotate
| base
|