Age | Commit message (Expand) | Author |
---|---|---|
2014-03-20 | Introduce git_merge_file for consumers | Edward Thomson |
2014-01-21 | Introduce diff3 mode for checking out conflicts | Edward Thomson |
2014-01-21 | merge_file should use more aggressive levels | Edward Thomson |
2013-05-16 | Fix trailing whitespaces | nulltoken |
2013-05-01 | merge! | Edward Thomson |