summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2005-07-29 12:53:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-01 22:20:14 (GMT)
commitbbd14cb0113ca26d679970f4db9ad953fb273e36 (patch)
tree2e95edc112e7e6254ba6f817887dc94acbcdf370 /Makefile
parent4d8fa916c9ff89613234f41b9222a2b679bce5c3 (diff)
downloadgit-bbd14cb0113ca26d679970f4db9ad953fb273e36.zip
git-bbd14cb0113ca26d679970f4db9ad953fb273e36.tar.gz
git-bbd14cb0113ca26d679970f4db9ad953fb273e36.tar.bz2
[PATCH] git-merge-cache -q doesn't complain about failing merge program
git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions