Give default merge message after failed automerge.
[git] / git-resolve.sh
2005-09-08  Junio C HamanoBig tool rename.