Commit Graph

1 Commits

Author SHA1 Message Date
Jakob Borg 47e64ae503 Handle conflicts when pulling (fixes #220) 2015-03-30 00:01:52 +02:00