mergetools / vimdiff2on commit Merge branch 'jk/interpret-branch-name-fix' (4e9f932)
   1. "$MERGE_TOOLS_DIR/vimdiff"