Determine conflict winner based on change type and modification time (fixes #1848)

2015-07-21 15:29:02 +02:00
parent 6e4d33c741
commit da4ebb6535
5 changed files with 106 additions and 24 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -35,7 +35,7 @@
 		},
 		{
 			"ImportPath": "github.com/syncthing/protocol",
-			"Rev": "7996ef0d45b7743ff930048b6413b37b2c33cd85"
+			"Rev": "fcbd12b42176237d48985c1bfafbc43b2107aa31"
 		},
 		{
 			"ImportPath": "github.com/syndtr/goleveldb/leveldb",