mergetools / gvimdiff3on commit Merge branch 'js/rebase-i-final' (d1114d8)
   1. "$MERGE_TOOLS_DIR/vimdiff"