mergetools / gvimdiffon commit Merge branch 'js/rebase-r-strategy' (917a319)
   1. "$MERGE_TOOLS_DIR/vimdiff"