Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mk/combine-diff-context-horizon-fix' | Junio C Hamano | 2013-06-02 | 1 | -0/+48 |
|\ | |||||
| * | combine-diff.c: Fix output when changes are exactly 3 lines apart | Matthijs Kooijman | 2013-05-15 | 1 | -0/+48 |
* | | combine-diff: coalesce lost lines optimally | Antoine Pelisse | 2013-03-25 | 1 | -0/+129 |
* | | Allow combined diff to ignore white-spaces | Antoine Pelisse | 2013-03-14 | 1 | -0/+111 |
* | | t4038: add tests for "diff --cc --raw <trees>" | John Keeping | 2013-02-05 | 1 | -0/+24 |
|/ | |||||
* | combined diff: correctly handle truncated file | Thomas Rast | 2010-04-17 | 1 | -0/+8 |
* | tests: update tests that used to fail | Junio C Hamano | 2010-01-28 | 1 | -1/+1 |
* | diff --cc: a lost line at the beginning of the file is shown incorrectly | Junio C Hamano | 2009-07-22 | 1 | -0/+84 |