Skip to content

Commit 39ceada

Browse files
authored
Merge pull request #20520 from geoffw0/gitignore
Add .orig files to the .gitignore.
2 parents 1a4cfba + b22227d commit 39ceada

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,6 @@ node_modules/
7676
# some upgrade/downgrade checks create these files
7777
**/upgrades/*/*.dbscheme.stats
7878
**/downgrades/*/*.dbscheme.stats
79+
80+
# Mergetool files
81+
*.orig

0 commit comments

Comments
 (0)