master 7446e75: * .gitignore: Don't ignore .rej files

[Stefan Monnier]

branch: master
commit 7446e75b8b6c09e80af3b6b02f44e69e0d2e250d
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * .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.
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e75df8b..389fb45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -251,7 +251,6 @@ gnustmp*
 
 # Version control and locks.
 *.orig
-*.rej
 *.swp
 *~
 .#*