![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 28 Jul 2006 19:23:52 +0000 (12:23 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 28 Jul 2006 19:23:52 +0000 (12:23 -0700) |
* jc/diff:
git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-diff.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-diff.c
Simple merge