mergetools / gvimdiffon commit rebase: decouple --exec from --interactive (78ec240)
   1. "$MERGE_TOOLS_DIR/vimdiff"