Merge branch 'coryrc-fix-merge-with-dots' into compare

This commit is contained in:
Mike Farah
2020-02-07 09:10:25 +11:00
3 changed files with 14 additions and 6 deletions

View File

@@ -4,4 +4,4 @@ c:
toast: leave
test: 1
tell: 1
taco: cool
tasty.taco: cool