![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 8 Apr 2006 00:57:46 +0000 (17:57 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 8 Apr 2006 00:57:46 +0000 (17:57 -0700) | ||
| commit | 45fa7608bd1abd4dca12b0b90a852e7a71377381 | |
| tree | 8cb0bf6b3cf363f3f9c1af2f37907d2e86165443 | tree | snapshot |
| parent | d69dc373cbf58d88d19dcbc6cff37e12b17f8fd2 | commit | diff |
| parent | 5040f17eba15504bad66b14a645bddd9b015ebb7 | commit | diff |
Merge branch 'jc/blame'
* jc/blame:
blame -S <ancestry-file>
Match ofs/cnt types in diff interface.
blame: use built-in xdiff
combine-diff: move the code to parse hunk-header into common library.
combine-diff: refactor built-in xdiff interface.
combine-diff: use built-in xdiff.
* jc/blame:
blame -S <ancestry-file>
Match ofs/cnt types in diff interface.
blame: use built-in xdiff
combine-diff: move the code to parse hunk-header into common library.
combine-diff: refactor built-in xdiff interface.
combine-diff: use built-in xdiff.
| Makefile | diff1 | | diff2 | | blob | history |
| blame.c | diff1 | | diff2 | | blob | history |