mergetools / gvimdiffon commit Merge branch 'rr/prompt-revert-head' (5ab3e4c)
   1. "$MERGE_TOOLS_DIR/vimdiff"