Merge branch 'dl/lore-is-the-archive'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"