commit | bbd14cb0113ca26d679970f4db9ad953fb273e36 | [log] [tgz] |
---|---|---|
author | Petr Baudis <pasky@suse.cz> | Fri Jul 29 14:53:38 2005 +0200 |
committer | Junio C Hamano <junkio@cox.net> | Mon Aug 01 15:20:14 2005 -0700 |
tree | 2e95edc112e7e6254ba6f817887dc94acbcdf370 | |
parent | 4d8fa916c9ff89613234f41b9222a2b679bce5c3 [diff] |
[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>