mergetools / gvimdiff3on commit Merge branch 'jd/subtree' (7173ad7)
   1. "$MERGE_TOOLS_DIR/vimdiff"