merge-one-file: leave unmerged index entries upon automerge failure.
[git/gitweb.git] / debian / compat
blobb8626c4cff2849624fb67f87cd0ad72b163671ad