Index reset should generate file conflicts (fixes #1613)

2015-04-09 12:53:41 +02:00
parent f45865606a
commit 936c76119d
6 changed files with 60 additions and 8 deletions
--- a/Godeps/_workspace/src/github.com/thejerf/suture/pre-commit
+++ b/Godeps/_workspace/src/github.com/thejerf/suture/pre-commit
@@ -9,3 +9,4 @@ if [ ! -z "$GOLINTOUT" -o "$?" != 0 ]; then
 fi

 go test
+