Jakob Borg
|
4b750b6dc3
all: Remove usage of deprecated io/ioutil (#7971)
|
2 éve |
Jakob Borg
|
d47745a86b
all: Update build constraints to Go 1.17 style (#7894)
|
3 éve |
Simon Frei
|
bc53782f88
test: Update conflict integration test (ref #5511) (#5618)
|
5 éve |
Jakob Borg
|
74b820f287
test: Update conflict tests
|
6 éve |
Jakob Borg
|
e589e6c19d
test: Forgot a resume
|
6 éve |
Jakob Borg
|
80031c59da
test: Clean & unflake cli & conflict tests
|
6 éve |
Jakob Borg
|
72c5f2e5c6
test: Updates for fs/osutil package changes
|
6 éve |
HairyFotr
|
7cbd92e1b1
all: Fix comment typos
|
6 éve |
Jakob Borg
|
f7fc0c1d3e
all: Update license url to https (ref #3976)
|
7 éve |
Jakob Borg
|
37f866b47f
Use pause/resume device to ensure TestConflictsDefault can run
|
8 éve |
Jakob Borg
|
7705a6c1f1
mv internal lib
|
9 éve |
Jakob Borg
|
da4ebb6535
Determine conflict winner based on change type and modification time (fixes #1848)
|
9 éve |
Jakob Borg
|
c3d07d60ca
Refactored integration tests
|
9 éve |
Jakob Borg
|
9463192224
Refactor integration tests to be a little cleaner and more stable, I hope
|
9 éve |
Audrius Butkevicius
|
50d377d9fe
Fix integration tests
|
9 éve |
Audrius Butkevicius
|
d12db3e7b8
Add osutil.Glob to deal with Windows (fixes #1690)
|
9 éve |
Jakob Borg
|
f45865606a
Add initial merge and reset conflict tests
|
9 éve |
Jakob Borg
|
54752deaa1
Move index to index-v0.11.0.db (new format) and centralize location config
|
9 éve |
Jakob Borg
|
47e64ae503
Handle conflicts when pulling (fixes #220)
|
9 éve |