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