mergetools / vimdiff3on commit Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD (9ba3b14)
   1. "$MERGE_TOOLS_DIR/vimdiff"