Merge branch 'lh/branch-merged'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 May 2008 02:16:06 +0000 (19:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 May 2008 02:16:06 +0000 (19:16 -0700)
* 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


Trivial merge