mergetools / gvimdiff2on commit Merge branch 'dl/subtree-avoid-tricky-echo' (b54301b)
   1. "$MERGE_TOOLS_DIR/vimdiff"