debian / compaton commit git-merge-ours: make sure our index matches HEAD (160252f)
   14