Code

Merge branch 'maint-1.6.2' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 08:51:54 +0000 (00:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 08:51:54 +0000 (00:51 -0800)
* 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

1  2 
base85.c
builtin-checkout.c

diff --cc base85.c
Simple merge
Simple merge