mergetools / gvimdiffon commit rebase: add a config option to default to --reschedule-failed-exec (969de3f)
   1. "$MERGE_TOOLS_DIR/vimdiff"