![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 08:51:54 +0000 (00:51 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 08:51:54 +0000 (00:51 -0800) | ||
| commit | 8fb5d44a47dd3657c8be0de5dcf220935b04e98e | |
| tree | 838aeb98297028e098849fd8a589b36a92ee89dc | tree | snapshot |
| parent | 578b62bfa239caca89e37fca05dcbed5add17699 | commit | diff |
| parent | c5034673fd92b6278e6c9d55683770ec01fafc89 | commit | diff |
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
* 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
| base85.c | diff1 | | diff2 | | blob | history |
| builtin-checkout.c | diff1 | | diff2 | | blob | history |