Commit Graph

2 Commits

Author SHA1 Message Date
André Cruz
e704733743 Read, use and update persistent resolutions.
Add --save-resolutions to deal with this.
Also:
  - Adjust logging when using compact
  - Minor code adjustments.
2013-06-07 13:05:07 +01:00
André Cruz
79522194f1 Inform the user when a conflict was resolved with a configured resolution. 2013-06-06 01:05:55 +01:00