| Thu, 01 Nov 2018 15:47:26 -0400 |
Augie Fackler |
tests: add a critical flush() to run-tests.py to make output stable on py3
|
| Sat, 13 Oct 2018 07:49:20 -0700 |
Kyle Lippincott |
merge-tools: when calling external merge tool, describe the resolve inputs
|
| Fri, 26 Oct 2018 21:46:37 +0900 |
Yuya Nishihara |
templatekw: deprecate p1rev/p2rev/p1node/p2node in favor of p1/p2
|
| Fri, 26 Oct 2018 21:43:20 +0900 |
Yuya Nishihara |
templatekw: add p1/p2 keywords which switches the current ctx
|
| Fri, 19 Oct 2018 21:11:30 +0900 |
Yuya Nishihara |
templater: add wrapper for a single template mapping
|
| Fri, 26 Oct 2018 21:28:20 +0900 |
Yuya Nishihara |
templatekw: extract internal "{rev}:{node|formatnode}" template to constant
|
| Mon, 05 Nov 2018 15:01:45 -0800 |
Kyle Lippincott |
tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken
stable
|
| Fri, 02 Nov 2018 11:57:45 -0700 |
Kyle Lippincott |
resolve: when resolve.mark-check=abort, downgrade to warning if pats specified
stable
|
| Thu, 01 Nov 2018 14:35:18 +0100 |
Boris Feld |
test: remove changes preparing the drop of `HGMERGE`
|
| Thu, 01 Nov 2018 14:29:21 +0100 |
Boris Feld |
run-tests: define the default merge tool through configuration
|
| Fri, 19 Oct 2018 01:52:16 +0200 |
Boris Feld |
run-tests: explicitly declare the list of dropped environment variable
|
| Thu, 01 Nov 2018 14:29:14 +0100 |
Boris Feld |
test: drop usage of `HGMERGE` in `test-lfconvert.t`
|
| Thu, 01 Nov 2018 14:26:30 +0100 |
Boris Feld |
test: drop usage of `HGMERGE` in `test-merge-types.t`
|
| Thu, 01 Nov 2018 14:24:34 +0100 |
Boris Feld |
test: use the "correct" merge tool in `test-rebase-detach.t`
|
| Wed, 31 Oct 2018 19:12:32 +0100 |
Boris Feld |
test: also deactivate `ui.merge` when testing merge tool
|
