mergetools / gvimdiff2on commit Merge branch 'ch/subtree-build' (42a165c)
   1. "$MERGE_TOOLS_DIR/vimdiff"