Give default merge message after failed automerge.
[git] / git-merge-resolve.sh
2005-09-11  Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'.
2005-09-11  Junio C HamanoMulti-backend merge driver.