[PATCH] More descriptive messages for conflict cases in merges
[git.git] / git-merge-octopus.sh
2005-09-11 Junio C HamanoMulti-backend merge driver.