mergetools / vimdiff2on commit Merge branch 'pw/rebase-keep-empty-fixes' (d892bee)
   1. "$MERGE_TOOLS_DIR/vimdiff"