]> err.no Git - linux-2.6/search
When a merge does not work automatically, git prevents