aboutsummaryrefslogtreecommitdiff
path: root/test/conflict_test.go
AgeCommit message (Expand)Author
2021-11-22all: Remove usage of deprecated io/ioutil (#7971)Jakob Borg
2021-08-17all: Update build constraints to Go 1.17 style (#7894)Jakob Borg
2019-03-25test: Update conflict integration test (ref #5511) (#5618)Simon Frei
2018-03-04test: Update conflict testsJakob Borg
2017-11-21test: Forgot a resumeJakob Borg
2017-11-13test: Clean & unflake cli & conflict testsJakob Borg
2017-11-13test: Updates for fs/osutil package changesJakob Borg
2017-11-04all: Fix comment typosHairyFotr
2017-02-09all: Update license url to https (ref #3976)Jakob Borg
2015-11-17Use pause/resume device to ensure TestConflictsDefault can runJakob Borg
2015-08-09mv internal libJakob Borg
2015-07-21Determine conflict winner based on change type and modification time (fixes #...Jakob Borg
2015-06-19Refactored integration testsJakob Borg
2015-05-23Refactor integration tests to be a little cleaner and more stable, I hopeJakob Borg
2015-04-28Fix integration testsAudrius Butkevicius
2015-04-26Add osutil.Glob to deal with Windows (fixes #1690)Audrius Butkevicius
2015-04-09Add initial merge and reset conflict testsJakob Borg
2015-04-01Move index to index-v0.11.0.db (new format) and centralize location configJakob Borg
2015-03-30Handle conflicts when pulling (fixes #220)Jakob Borg