diff options
| author | Petr Baudis <pasky@ucw.cz> | 2005-04-19 04:16:15 +0200 |
|---|---|---|
| committer | Petr Baudis <xpasky@machine.sinus.cz> | 2005-05-07 16:09:44 +0200 |
| commit | 8c59926f5e00082a4cbf1d9f31275917c5f7f001 (patch) | |
| tree | 1e6bdd60480e6bc46522377ba965827f22729062 /cat-file.c | |
| parent | e7d3dd248f50501f98b29c917e70bddcf3ea925a (diff) | |
| download | git-8c59926f5e00082a4cbf1d9f31275917c5f7f001.tar.gz | |
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.
Diffstat (limited to 'cat-file.c')
0 files changed, 0 insertions, 0 deletions