Make merge-cache not fail immediatelly when the merge program
authorPetr Baudis <pasky@ucw.cz>
Tue, 19 Apr 2005 02:16:15 +0000 (04:16 +0200)
committerPetr Baudis <xpasky@machine.sinus.cz>
Sat, 7 May 2005 14:09:44 +0000 (16:09 +0200)
commit8c59926...5e00082a4cbf1d9f31275917c5f7f001
tree1e6bdd6...480e6bc46522377ba965827f22729062copy hash to clipboard (tree)
parente7d3dd2...8f50501f98b29c917e70bddcf3ea925acopy hash to clipboard (diff)
merge-cache.c