Merge branch 'jc/add-refresh-unmerged'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:10 +0000 (13:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:10 +0000 (13:30 -0800)
* jc/add-refresh-unmerged:
  refresh_index: do not show unmerged path that is outside pathspec


Trivial merge