mergetools / gvimdiffon commit Merge branch 'js/rebase-i-root-fix' (f300f56)
   1. "$MERGE_TOOLS_DIR/vimdiff"