debian / compaton commit Add a new merge strategy by Fredrik Kuivinen. (720d150)
   14