[Bf-blender-cvs] [7d20ad6] master: ignore conflict files

Campbell Barton noreply at git.blender.org
Thu Aug 7 21:47:44 CEST 2014


Commit: 7d20ad6a1ba46cad209d17d144af1cffbab334fc
Author: Campbell Barton
Date:   Fri Aug 8 05:47:15 2014 +1000
Branches: master
https://developer.blender.org/rB7d20ad6a1ba46cad209d17d144af1cffbab334fc

ignore conflict files

===================================================================

M	.gitignore

===================================================================

diff --git a/.gitignore b/.gitignore
index b172c44..21a07b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,10 @@ __pycache__/
 *.swo
 *#
 
+# conflicts
+*.orig
+*.rej
+
 # QtCreator
 CMakeLists.txt.user




More information about the Bf-blender-cvs mailing list