Add a new merge strategy by Fredrik Kuivinen.
[git.git] / debian / git-core.files
1 /usr