diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:07 -0700 |
| commit | f735a50ffdf0e1734438f0c0e6d70c4a81eea09e (patch) | |
| tree | 50aca0214a8e441ef3d67b08f8d38a9226e8c851 /t | |
| parent | 1f7b196e2181c4d23959193327941ee4e065748c (diff) | |
| parent | cce076e37107217faa942dddc20e79ae7350bc1f (diff) | |
| download | git-f735a50ffdf0e1734438f0c0e6d70c4a81eea09e.tar.gz git-f735a50ffdf0e1734438f0c0e6d70c4a81eea09e.tar.xz | |
Merge branch 'nf/mergetool-prompt' into HEAD
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 4e713f7aa..ff7a9e968 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 |