mergetools / gvimdiff3on commit Merge branch 'nd/ita-cleanup' (cc14ea8)
   1. "$MERGE_TOOLS_DIR/vimdiff"