Audrius Butkevicius 5fe15475a4 Merge pull request #1540 from calmh/conflicts ...

Handle conflicts when pulling (fixes #220)

2015-03-30 21:20:23 +01: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

Improvements to integration tests

2015-01-22 00:18:08 +00:00

.gitignore

Need config available for -reset (fixes #1111)

2014-12-12 21:29:57 +01:00

cli_test.go

MPLv2

2015-03-17 16:02:27 +01:00

conflict_test.go

Handle conflicts when pulling (fixes #220)

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

filetype_test.go

MPLv2

2015-03-17 16:02:27 +01:00

http_test.go

MPLv2

2015-03-17 16:02:27 +01:00

httpstress_test.go

MPLv2

2015-03-17 16:02:27 +01:00

ignore_test.go

More graceful handling on folder errors (fixes #762)

2015-03-30 08:27:12 +02:00

manypeers_test.go

MPLv2

2015-03-17 16:02:27 +01:00

parallell_scan_test.go

Refactor state tracking (...)

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

reconnect_test.go

MPLv2

2015-03-17 16:02:27 +01:00

symlink_test.go

MPLv2

2015-03-17 16:02:27 +01:00

sync_test.go

MPLv2

2015-03-17 16:02:27 +01:00

syncthingprocess.go

MPLv2

2015-03-17 16:02:27 +01:00

transfer-bench_test.go

Refactor state tracking (...)

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

util.go

MPLv2

2015-03-17 16:02:27 +01:00