mergetools / vimdiff2on commit Merge branch 'jc/apply-ws-fix-tab-in-indent' (a70f4cb)
   1. "$MERGE_TOOLS_DIR/vimdiff"