My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e9d309e) | patch
t7610: add mergetool --gui tests
authorDenton Liu <liu.denton@gmail.com>
Wed, 24 Apr 2019 22:46:59 +0000 (15:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 02:31:49 +0000 (11:31 +0900)
commit57d93c1d2ce7deddf485e7c826278fef6815ec6b
treea4216b17336fa09c3a15325eafd452fcb6179aa3tree | snapshot
parente9d309e2fcd4faaeee9d20ef2a46bf86a4847bd0commit | diff
t7610: add mergetool --gui tests

In 063f2bdbf7 (mergetool: accept -g/--[no-]gui as arguments,
2018-10-24), mergetool was taught the --gui option but no tests were
added to ensure that it was working properly. Add a test to ensure that
it works.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7610-mergetool.sh diff | blob | history
The core git plumbing