mergetools / gvimdiff2on commit Merge branch 'mh/attr-macro-doc' (ac35529)
   1. "$MERGE_TOOLS_DIR/vimdiff"