Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Introduce diff3 mode for checking out conflicts | Edward Thomson | 2014-01-20 | 1 | -0/+9 |
* | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 1 | -1/+13 |
* | Fix trailing whitespaces | nulltoken | 2013-05-15 | 1 | -3/+3 |
* | merge! | Edward Thomson | 2013-04-30 | 1 | -0/+71 |