[PATCH] Be more like the 'resolve' strategy.
[git.git] / git-merge-octopus.sh
2005-09-11 Junio C HamanoMulti-backend merge driver.