Sun, 11 Oct 2015 23:56:44 -0700 |
Siddharth Agarwal |
test-resolve.t: add some tests for .orig file contents
|
Sun, 11 Oct 2015 23:54:40 -0700 |
Siddharth Agarwal |
test-resolve.t: add some output to show order of operations
|
Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
Fri, 25 Sep 2015 03:51:46 -0400 |
timeless |
resolve: consistently describe re-merge + unresolved
|
Wed, 11 Feb 2015 13:59:13 +0900 |
Yuya Nishihara |
resolve: port to generic templater
|
Wed, 11 Feb 2015 13:47:43 +0900 |
Yuya Nishihara |
resolve: silence warning of unknown pats for -l/--list (BC)
|
Fri, 17 Oct 2014 11:01:05 -0400 |
Augie Fackler |
test-resolve.t: use redirection to /dev/null instead of grep -q
|
Wed, 08 Oct 2014 22:30:04 -0700 |
Martin von Zweigbergk |
resolve: run happily after conflict-free merge
|
Wed, 08 Oct 2014 22:16:18 -0700 |
Martin von Zweigbergk |
test-resolve: add tests for re-merge
|
Wed, 08 Oct 2014 22:19:08 -0700 |
Martin von Zweigbergk |
test-resolve: add more tests for in conflict-free states
|
Wed, 08 Oct 2014 21:07:30 -0700 |
Martin von Zweigbergk |
test-resolve: add test resolving one of two files
|
Wed, 08 Oct 2014 21:19:31 -0700 |
Martin von Zweigbergk |
test-resolve: clarify test descriptions and consistently use "should"
|
Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
Mon, 09 Jun 2014 14:11:17 -0500 |
Matt Mackall |
resolve: fix grammar of no matching files message
|