Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Oct 2008 08:52:32 +0000 (01:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Oct 2008 08:52:32 +0000 (01:52 -0700)
commit46dc1b0...332612aa32c139007fa33f4b429de9d1
tree86e934a...60e69c03c44a9d59eab6e400c16efb5fcopy hash to clipboard (tree)
parent84ed4c5...117d72f02cc918e413b9861a9d2846d7copy hash to clipboard (diff)
parent8ed0a74...dd42bd0724aebed6e3b07c4ea2a2d5e8copy hash to clipboard (diff)
remote.c
t/t4018-diff-funcname.sh
t/t7600-merge.sh
xdiff-interface.c