diff options
| author |  Petr Baudis <pasky@suse.cz> | 2005-07-29 14:53:38 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-08-01 15:20:14 -0700 |
| commit | bbd14cb0113ca26d679970f4db9ad953fb273e36 (patch) | |
| tree | 2e95edc112e7e6254ba6f817887dc94acbcdf370 /Makefile | |
| parent | [PATCH] Fix sparse warnings (diff) | |
| download | tgif-bbd14cb0113ca26d679970f4db9ad953fb273e36.tar.xz | |
[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