Commit History

Author SHA1 Message Date
  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