Merge branch 'ap/trackinfo'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:27 +0000 (18:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:27 +0000 (18:00 -0700)
* ap/trackinfo:
Reword "your branch has diverged..." lines to reduce line length

Trivial merge