diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-13 21:38:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-13 21:38:59 (GMT) |
| commit | 2cd861672e1021012f40597b9b68cc3a9af62e10 (patch) | |
| tree | 5638bb031b32cb06df4ec87ff8066c2ca48cd7c9 /git-difftool.perl | |
| parent | 5032098614b6f68258d1f5d13615b9dcbf25f040 (diff) | |
| parent | 8f29299136c2f11730d876cd62637a9e37d4c388 (diff) | |
| download | git-2cd861672e1021012f40597b9b68cc3a9af62e10.zip git-2cd861672e1021012f40597b9b68cc3a9af62e10.tar.gz git-2cd861672e1021012f40597b9b68cc3a9af62e10.tar.bz2 | |
Merge branch 'bm/merge-base-octopus-dedup' into maint
"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.
* bm/merge-base-octopus-dedup:
merge-base --octopus: reduce the result from get_octopus_merge_bases()
merge-base: separate "--independent" codepath into its own helper
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions