]> git.ipfire.org Git - thirdparty/git.git/search
merge-one-file: use empty- or common-base condintionally in two-stage merge.