mergetools / gvimdiff2on commit Merge branch 'nd/pretty-formats' (c85f0a2)
   1. "$MERGE_TOOLS_DIR/vimdiff"