From: Junio C Hamano Date: Thu, 14 May 2009 04:06:11 +0000 (-0700) Subject: Merge branch 'maint-1.6.1' into maint-1.6.2 X-Git-Tag: v1.6.3.2~43^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/213195185c8aa09d6192b85a3f78bf46f19f51a4 Merge branch 'maint-1.6.1' into maint-1.6.2 * maint-1.6.1: ls-tree manpage: output of ls-tree is compatible with update-index ls-tree manpage: use "unless" instead of "when ... is not" --- 213195185c8aa09d6192b85a3f78bf46f19f51a4