| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | diff: don't feed large files to xdiff | Edward Thomson | 2015-10-05 | 1 | -13/+0 |
| * | merge_file: treat large files as binary | Edward Thomson | 2015-10-05 | 1 | -3/+2 |
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -78/+0 |
| * | 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 |
