![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700) | ||
| commit | 096b1732343305b7096b1085c23eba8cd83569c7 | |
| tree | c50b023920773dbd284d949ee978bd0bee05df94 | tree | snapshot |
| parent | e918c6abac65fb56b381f37cc139753fbe6768a3 | commit | diff |
| parent | 0c7993839b92f466278439a724023f8be50391c1 | commit | diff |
Merge branch 'lt/merge-tree'
* lt/merge-tree:
Improved three-way blob merging code
Prepare "git-merge-tree" for future work
xdiff: generate "anti-diffs" aka what is common to two files
* lt/merge-tree:
Improved three-way blob merging code
Prepare "git-merge-tree" for future work
xdiff: generate "anti-diffs" aka what is common to two files
| Makefile | diff1 | | diff2 | | blob | history |