debian / git-core.fileson commit Add a new merge strategy by Fredrik Kuivinen. (720d150)
   1/usr