| 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
|
| Wed, 31 Oct 2018 18:43:56 +0100 |
Boris Feld |
tests: adjust merge tool config in test-largefiles-update.t
|
| Fri, 20 Apr 2018 18:08:54 +0200 |
Boris Feld |
extensions: include current version in "invalid version" message
|
| Fri, 19 Oct 2018 01:07:08 +0200 |
Boris Feld |
obsolete: prefetch the repo.obsstore used in phasedivergence loop
|
| Fri, 19 Oct 2018 00:53:18 +0200 |
Boris Feld |
obsutil: prefetch method in allpredecessors loop
|
| Fri, 02 Nov 2018 14:24:29 -0400 |
Augie Fackler |
merge with stable
|
