mergetools / gvimdiffon commit rebase-helper --make-script: introduce a flag to recreate merges (7d63271)
   1. "$MERGE_TOOLS_DIR/vimdiff"