Merge branch 'jc/diff' into next
commita5abcd094b8592209aa70fa9b3e149f2f9be6eea
authorJunio C Hamano <junkio@cox.net>
Sun, 5 Mar 2006 00:21:38 +0000 (4 16:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 5 Mar 2006 00:21:38 +0000 (4 16:21 -0800)
treea8dcdaca637a8a170662290ce60647636df7c746
parent3ab8532b07f37e9f16df8aaaadd175646b7bea26
parentce2a34188b70c2d04ffdc1d9d3acc04d7a35c5c6
Merge branch 'jc/diff' into next

* jc/diff:
  Merge jc/diff leftover bits.