[PATCH] Apply N -> A status change in diff-helper
[git.git] / git-merge-octopus.sh
2005-09-11 Junio C HamanoMulti-backend merge driver.