Re: A note on merging conflicts..

Rene Scharfe [off-list ref] writes:

I wonder why the two clear_commit_marks() calls at the end of
get_merge_bases() are not sufficient, though.

I missed to notice that Johannes had added those calls there; we
should remove them from get_merge_bases().

The normal case of git-merge-base calling get_merge_bases() once
and exiting should NOT have to pay for the clean-up cost at all.