mergetools / vimdiff2on commit Merge branch 'jn/wt-status' into maint (0a01752)
   1. "$MERGE_TOOLS_DIR/vimdiff"