mergetools / gvimdiff2on commit Merge branch 'jh/note-trees-record-blobs' (b37f81b)
   1. "$MERGE_TOOLS_DIR/vimdiff"