| Thu, 26 Jan 2023 00:23:07 +0100 |
Cédric Krier |
filemerge: add union-other-first as internal merge tool
|
file |
diff |
annotate
|
| Fri, 18 Nov 2022 13:47:29 +0000 |
Arseniy Alekseyev |
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
stable
|
file |
diff |
annotate
|
| Fri, 14 Jan 2022 09:28:44 -0800 |
Martin von Zweigbergk |
merge: consider the file merged when using :merge-{local,other}
|
file |
diff |
annotate
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
file |
diff |
annotate
|
| Sun, 16 Aug 2015 10:19:00 +0200 |
Erik Huelsmann |
filemerge: add 'union' merge to internal merge tool
|
file |
diff |
annotate
|
| Fri, 17 Sep 2010 17:03:08 -0500 |
Matt Mackall |
tests: fix a bunch of pointless #s in unified tests
|
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
|
| Sat, 11 Sep 2010 20:04:35 +0200 |
Adrian Buehlmann |
tests: unify test-merge-internal-tools-pattern
|
file |
diff |
annotate
| base
|