Commit message (Expand) | Author | Age | |
---|---|---|---|
* | doh't use "def" for command definitions, it conflicts with Data.Default.def | Joey Hess | 2014-10-14 |
* | hlint | Joey Hess | 2014-10-09 |
* | resolvemerge: finish up by committing | Joey Hess | 2014-07-11 |
* | resolvemerge: New plumbing command that runs the automatic merge conflict res... | Joey Hess | 2014-07-11 |