Commit message (Expand) | Author | Age | |
---|---|---|---|
* | simplify | 2014-06-09 | |
* | avoid fast-forwarding when a merge conflict was auto-resolved | 2014-06-09 | |
* | avoid bad commits after interrupted direct mode sync (or merge) | 2014-06-09 | |
* | style | 2014-03-04 | |
* | sync: Automatically resolve merge conflict between and annexed file and a reg... | 2014-03-04 | |
* | factor out Annex.AutoMerge from Command.Sync | 2014-03-04 |