mergetools / vimdiff2on commit Merge branch 'jk/test-output' (31d176d)
   1. "$MERGE_TOOLS_DIR/vimdiff"