Jakob Borg 47e64ae503 Handle conflicts when pulling (fixes #220)

2015-03-30 00:01:52 +02:00

..

h1

Update integration test configs to v10

2015-03-21 15:40:00 +01:00

h2

Update integration test configs to v10

2015-03-21 15:40:00 +01:00

h3

Update integration test configs to v10

2015-03-21 15:40:00 +01:00

logs

…

.gitignore

…

cli_test.go

…

conflict_test.go

Handle conflicts when pulling (fixes #220)

2015-03-30 00:01:52 +02:00

filetype_test.go

…

http_test.go

…

httpstress_test.go

…

ignore_test.go

Refactor state tracking (...)

2015-03-17 19:37:06 +01:00

manypeers_test.go

…

parallell_scan_test.go

Refactor state tracking (...)

2015-03-17 19:37:06 +01:00

reconnect_test.go

…

symlink_test.go

…

sync_test.go

…

syncthingprocess.go

…

transfer-bench_test.go

Refactor state tracking (...)

2015-03-17 19:37:06 +01:00

util.go

…