Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
clone: use --progress to force progress reporting
[gitweb.git]
/
t
/
t7800-difftool.sh
diff --git
a/t/t7800-difftool.sh
b/t/t7800-difftool.sh
index ebdccf9a1eb9f9bb4918fc5adee8bdb8fd682608..fff6a6d0eab4b27d5bc7ff4636913cb10296ab7b 100755
(executable)
--- a/
t/t7800-difftool.sh
+++ b/
t/t7800-difftool.sh
@@
-136,7
+136,7
@@
test_expect_success 'GIT_DIFFTOOL_PROMPT variable' '
GIT_DIFFTOOL_PROMPT=true &&
export GIT_DIFFTOOL_PROMPT &&
- prompt=$(echo | git difftool
--prompt
branch | tail -1) &&
+ prompt=$(echo | git difftool branch | tail -1) &&
prompt_given "$prompt" &&
restore_test_defaults