| commit | 8c59926f5e00082a4cbf1d9f31275917c5f7f001 | |
| author | Petr Baudis <pasky@ucw.cz> | |
| Tue, 19 Apr 2005 02:16:15 +0000 (19 04:16 +0200) | ||
| committer | Petr Baudis <xpasky@machine.sinus.cz> | |
| Sat, 7 May 2005 14:09:44 +0000 (7 16:09 +0200) | ||
| tree | 1e6bdd60480e6bc46522377ba965827f22729062 | treesnapshot (tar.gz zip) |
| parent | e7d3dd248f50501f98b29c917e70bddcf3ea925a | commitdiff |
Make merge-cache not fail immediatelly when the merge program
fails, but go on and return error code at the end. It makes sense
to try to merge everything, then let the user solve the commits
at once.
fails, but go on and return error code at the end. It makes sense
to try to merge everything, then let the user solve the commits
at once.
| merge-cache.c | diffblobblamehistory |