mergetools / gvimdiff3on commit Merge branch 'js/rebase-i-shortopt' (85fcf1c)
   1. "$MERGE_TOOLS_DIR/vimdiff"