From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Jul 2006 07:53:39 +0000 (-0700)
Subject: Merge branch 'jc/show-merge'
X-Git-Tag: v1.4.2-rc1~47
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=868227b0d1f3a295ea9afe7a3be3a1fbdff62442;p=git.git

Merge branch 'jc/show-merge'

* jc/show-merge:
  git log -p --merge [[--] paths...]
---

868227b0d1f3a295ea9afe7a3be3a1fbdff62442