Index reset should generate file conflicts (fixes #1613) · 936c76119d - syncthing - Gitea: Git with a cup of tea

felixfoertsch/syncthing

Index reset should generate file conflicts (fixes #1613)

This commit is contained in:

Jakob Borg

2015-04-09 13:06:09 +02:00

parent f45865606a

commit 936c76119d

6 changed files with 59 additions and 7 deletions

Godeps/_workspace/src/github.com/thejerf/suture/pre-commit

Generated Vendored

+1

View File

@@ -9,3 +9,4 @@ if [ ! -z "$GOLINTOUT" -o "$?" != 0 ]; then
 fi
 go test