mergetools / gvimdiff2on commit Merge branch 'jc/read-tree-empty-with-m' (f55734f)
   1. "$MERGE_TOOLS_DIR/vimdiff"