mergetools / gvimdiffon commit Merge branch 'jc/merge-refuse-new-root' (175008d)
   1. "$MERGE_TOOLS_DIR/vimdiff"