log

age author description
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