debian / compaton commit git-merge: make recursive the default strategy (fbf8ac2)
   14