]> git.ipfire.org Git - thirdparty/git.git/search
merge-recursive: point the user to commit when file would be overwritten.