From: Junio C Hamano Date: Mon, 21 Jul 2008 01:00:27 +0000 (-0700) Subject: Merge branch 'ap/trackinfo' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=93310a40eb022a0e36e7c618921931d8ffc31fd1;p=git.git Merge branch 'ap/trackinfo' * ap/trackinfo: Reword "your branch has diverged..." lines to reduce line length --- 93310a40eb022a0e36e7c618921931d8ffc31fd1