From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 May 2008 02:16:06 +0000 (-0700)
Subject: Merge branch 'lh/branch-merged'
X-Git-Tag: v1.5.6-rc0~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b79c9859c8eb3bb4390f91320e126199ff884907;p=git.git

Merge branch 'lh/branch-merged'

* lh/branch-merged:
  Add tests for `branch --[no-]merged`
  git-branch.txt: compare --contains, --merged and --no-merged
  git-branch: add support for --merged and --no-merged
---

b79c9859c8eb3bb4390f91320e126199ff884907