avoid partial commit during merge problem

git can commit in a post-merge hook, but for some reason only supports
committing all staged files, not only some.

0 files changed, 0 insertions, 0 deletions