| Thu, 13 Feb 2020 21:14:20 -0800 |
Martin von Zweigbergk |
debugmergestate: make templated
|
| Thu, 13 Feb 2020 21:55:38 -0800 |
Martin von Zweigbergk |
tests: add tests of debugmergestate with unresolved/resolved path conflicts
|
| Sat, 24 Mar 2018 22:10:58 -0400 |
Matt Harbison |
test-pathconflicts-merge: stop requiring symlink support
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
| Fri, 15 Dec 2017 17:52:38 -0500 |
Augie Fackler |
tests: test-pathconflicts-merge.t requires symlinks
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
| Tue, 24 Oct 2017 11:15:30 -0700 |
Siddharth Agarwal |
merge: disable path conflict checking by default (issue5716)
stable
|
| Tue, 10 Oct 2017 11:02:53 -0400 |
Augie Fackler |
tests: use readlink.py instead of readlink
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add test for path conflicts during merge
|
