mergetools / gvimdiff3on commit Merge branch 'js/rebase-recreate-merge' (a07baf3)
   1. "$MERGE_TOOLS_DIR/vimdiff"