octopus: do not do AND'ed merge base.
[git/git.git] / git-merge-octopus.sh
2005-11-11 Junio C Hamanooctopus: do not do AND'ed merge base.
2005-10-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-11 Junio C HamanoMulti-backend merge driver.