From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Jan 2010 08:51:54 +0000 (-0800)
Subject: Merge branch 'maint-1.6.2' into maint
X-Git-Tag: v1.6.6.1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fb5d44a47dd3657c8be0de5dcf220935b04e98e;p=thirdparty%2Fgit.git

Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
  base85: Make the code more obvious instead of explaining the non-obvious
  base85: encode_85() does not use the decode table
  base85 debug code: Fix length byte calculation
  checkout -m: do not try to fall back to --merge from an unborn branch

Conflicts:
	diff.c
---

8fb5d44a47dd3657c8be0de5dcf220935b04e98e