Merge branch 'lt/apply' into next
[git] / git-merge.sh
2005-09-11  Junio C HamanoMulti-backend merge driver.