Merge branch 'maint-1.6.2' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:46 +0000 (23:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:46 +0000 (23:48 -0700)
commit3ba4f3a...fc68ba4c5a0064107e8993c5fc5b684f
treeae4db43...8f007b3603534d720690869bc5c4b3e0copy hash to clipboard (tree)
parentef52aaf...0f8b1d34f2ecd9b58f2198711c87cab3copy hash to clipboard (diff)
parentcd12f53...129357d5347c1953db69bde68b5f46c9copy hash to clipboard (diff)
Documentation/git-svn.txt
ll-merge.c