diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-20 08:14:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-20 08:14:50 (GMT) |
| commit | 13dd790bbe658e03e429d91b8babe3a284663d6e (patch) | |
| tree | dff8806ee48d8cb38539c68b9c58816b1c6decfd /resolve-undo.c | |
| parent | 030a360849e9cb2b3c408cbf9d8c980f3aae5868 (diff) | |
| parent | ef7e93d90866e91bba5ff7f274c49dc44427a8ff (diff) | |
| download | git-13dd790bbe658e03e429d91b8babe3a284663d6e.zip git-13dd790bbe658e03e429d91b8babe3a284663d6e.tar.gz git-13dd790bbe658e03e429d91b8babe3a284663d6e.tar.bz2 | |
Merge branch 'cb/receive-pack-keep-errors'
* cb/receive-pack-keep-errors:
do not override receive-pack errors
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions