Code

Use 'merge-base --all' where applicable.
authorJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 02:54:14 +0000 (18:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 10 Nov 2005 02:54:14 +0000 (18:54 -0800)
commit13956670a7baf4b3b794a2cc799bd501753f1746
tree062177e5c6e31c9a9ddabb9066fd0331c2004f42
parenta489352e3d1d861237729385f9afc5950bcfa6a0
Use 'merge-base --all' where applicable.

It may get extra merge base on truly pathological commit histories,
but is a lot easier to understand, explain, and prove correctness.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh