From 847cca541c3666e687fc5ad6a0d3ba1733b89d81 Mon Sep 17 00:00:00 2001 From: bri <284789+b-@users.noreply.github.com> Date: Sat, 16 Jul 2022 14:38:56 -0400 Subject: Add .orig to .gitignore (#17626) --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index de2627d9d6..51b0a38e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ .DS_Store ._* +# Merge files +*.orig +*.rej + # Build artifacts .clang_complete .build/ -- cgit v1.2.3