Merge branch 'jc/diff'
commitf789f829933664dc4c3b0af7f1e2c5e37fc8621e
authorJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 19:23:52 +0000 (28 12:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 19:23:52 +0000 (28 12:23 -0700)
treed624439ae36dd19f37a2b8bb07a153b048953a19
parent5afa69b415fd020d6dd36751bdcf45fdbf07dd4a
parent9919f41c91e525fd813fd2cd006f8fdcf976a661
Merge branch 'jc/diff'

* jc/diff:
  git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
builtin-diff.c