diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-09 18:54:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-09 18:54:14 -0800 |
| commit | 13956670a7baf4b3b794a2cc799bd501753f1746 (patch) | |
| tree | 062177e5c6e31c9a9ddabb9066fd0331c2004f42 /git-merge-recursive.py | |
| parent | Merge branch 'hold/svn' (diff) | |
| download | git-13956670a7baf4b3b794a2cc799bd501753f1746.tar.gz git-13956670a7baf4b3b794a2cc799bd501753f1746.zip | |
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>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions