Commit History

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