Merge branch 'jc/show-merge'
commit868227b0d1f3a295ea9afe7a3be3a1fbdff62442
authorJunio C Hamano <junkio@cox.net>
Mon, 10 Jul 2006 07:53:39 +0000 (10 00:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 10 Jul 2006 07:53:39 +0000 (10 00:53 -0700)
treeb35d790d4b474a9eb9b2864a43a759b442d5f326
parenta9486b02ec7e03d17317fe538b0d06ca04379f23
parentae3e5e1ef2271524882d6bb7c0469f777a255315
Merge branch 'jc/show-merge'

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