mergetools / gvimdiff2on commit Merge branch 'jk/HEAD-symref-in-xfer-namespaces' (86d8730)
   1. "$MERGE_TOOLS_DIR/vimdiff"