]> git.ipfire.org Git - thirdparty/git.git/search
merge_file(): add comment explaining behavior wrt conflict style