debian / compaton commit Add 'ours' merge strategy. (64da9e6)
   14