Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:21 +0000 (23:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:48:21 +0000 (23:48 -0700)
commit4258c21...ca2c3674be4b7e00a19db705eee77a48
tree93e4219...1fc6e07f3dd18ea83aab9bd4ce2dd26ecopy hash to clipboard (tree)
parentdfe5051...c7e5ec2bc771c9a5f4c3318332a7744ecopy hash to clipboard (diff)
parentd4900ee...8c70114ea3227f922d383de6b273fcdecopy hash to clipboard (diff)
Documentation/git-svn.txt
ll-merge.c