diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:17 -0700 |
| commit | b97414352746967c72e5b87cce39efea4b93e2bf (patch) | |
| tree | 2737978df20165cd0149efde1ed35cca7e2611e8 /t | |
| parent | 9b782d297c141cc45973c8b455cc93495d86b277 (diff) | |
| parent | cce076e37107217faa942dddc20e79ae7350bc1f (diff) | |
| download | git-b97414352746967c72e5b87cce39efea4b93e2bf.tar.gz | |
Merge branch 'nf/mergetool-prompt'
UI consistency improvements.
* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 4e713f7aa5..ff7a9e968f 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -20,7 +20,7 @@ difftool_test_setup () prompt_given () { prompt="$1" - test "$prompt" = "Launch 'test-tool' [Y/n]: branch" + test "$prompt" = "Launch 'test-tool' [Y/n]? branch" } # Create a file on master and change it on branch |