debian / compaton commit [PATCH] Make sure git-resolve-script always works on commits (02a4a32)
   14