Merge pull request #14215 from ethereum/gitignore_orig_files

Add `*.orig` to `.gitignore`.
2023-10-03 13:03:40 +00:00 · 2023-05-12 13:31:21 +02:00
parent 0a0c389541 33bb833949
commit 3f2cde9bd6
1 changed files with 3 additions and 0 deletions
@@ -27,6 +27,9 @@ __pycache__
 *.a
 *.lib

+# ignore git mergetool backup files
+*.orig
+
 # Executables
 *.exe
 *.out