mergetools / gvimdiffon commit Merge branch 'js/rebase-orig-head-fix' (9fbcc3d)
   1. "$MERGE_TOOLS_DIR/vimdiff"