| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | resolvemerge: finish up by committing |  Joey Hess | 2014-07-11 |
| | | |||
| * | resolvemerge: New plumbing command that runs the automatic merge conflict ↵ | Joey Hess | 2014-07-11 |
| resolver. | |||
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| aboutsummaryrefslogtreecommitdiff |