mergetools / vimdiff2on commit Merge branch 'jk/fast-import-empty-ls' (7e39472)
   1. "$MERGE_TOOLS_DIR/vimdiff"