Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint
authorJunio C Hamano <redacted>
Tue, 22 Jul 2014 17:28:30 +0000 (10:28 -0700)
committerJunio C Hamano <redacted>
Tue, 22 Jul 2014 17:28:30 +0000 (10:28 -0700)
* cb/filter-branch-prune-empty-degenerate-merges:
  filter-branch: eliminate duplicate mapped parents


Trivial merge
git clone https://git.99rst.org/PROJECT