mergetools / gvimdiffon commit Merge branch 'js/rebase-i-dedup-call-to-rerere' (7267404)
   1. "$MERGE_TOOLS_DIR/vimdiff"