Merge pull request github#20520 from geoffw0/gitignore

Add .orig files to the .gitignore.

Author: geoffw0

.gitignore

@@ -76,3 +76,6 @@ node_modules/
 # some upgrade/downgrade checks create these files
 **/upgrades/*/*.dbscheme.stats
 **/downgrades/*/*.dbscheme.stats
+
+# Mergetool files
+*.orig