[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e918c6a 0c79938)
Merge branch 'lt/merge-tree'
authorJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700)
* 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

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Git - the stupid content tracker