Merge branch 'jc/add-refresh-unmerged' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 01:06:23 +0000 (17:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 01:06:23 +0000 (17:06 -0800)
* jc/add-refresh-unmerged:
  refresh_index: do not show unmerged path that is outside pathspec


Trivial merge