mergetools / vimdiff2on commit Merge branch 'ma/unpack-trees-free-msgs' (e47dbec)
   1. "$MERGE_TOOLS_DIR/vimdiff"