3 Commits

Author	SHA1	Message	Date
Jakob Borg	f45865606a	Add initial merge and reset conflict tests	2015-04-09 13:06:09 +02:00
Jakob Borg	54752deaa1	Move index to index-v0.11.0.db (new format) and centralize location config	2015-04-01 11:30:28 +02:00
Jakob Borg	47e64ae503	Handle conflicts when pulling (fixes #220)	2015-03-30 00:01:52 +02:00