Fall back to three-way merge when applying a patch.
[git.git] / git-applymbox.sh
2005-10-06 Junio C HamanoFall back to three-way merge when applying a patch.
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-08 Junio C HamanoBig tool rename.