Merge branch 'nd/status-show-in-progress'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:54 +0000 (10:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:54 +0000 (10:29 -0800)
* nd/status-show-in-progress:
  status: show the branch name if possible in in-progress info

1  2 
wt-status.c

diff --cc wt-status.c
Simple merge