From: Stefan Monnier Date: Sun, 27 Oct 2019 21:00:55 +0000 (-0400) Subject: * .gitignore: Don't ignore .rej files X-Git-Tag: emacs-27.0.90~859 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7446e75b8b6c09e80af3b6b02f44e69e0d2e250d;p=emacs.git * .gitignore: Don't ignore .rej files Left over rejected hunks that we forgot to merge by hand should not be silently ignored. Better explicitly remove/rename .rej files when done with them. --- diff --git a/.gitignore b/.gitignore index e75df8b8b61..389fb450d86 100644 --- a/.gitignore +++ b/.gitignore @@ -251,7 +251,6 @@ gnustmp* # Version control and locks. *.orig -*.rej *.swp *~ .#*