debian / compaton commit merge-recursive: leave unmerged entries in the index. (28e77a8)
   14