Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2009 07:46:25 +0000 (00:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2009 07:46:25 +0000 (00:46 -0700)
commit2254da0...a5473ffde973337bad2c6a96eea61e20
treec7b1bf0...a4094dbc3e6f209e379a15b66d6864aacopy hash to clipboard (tree)
parentf06b9f1...ffa67c1d28793bdaf7b2165d3d392d35copy hash to clipboard (diff)
parent3e73cb2...48cc4044905455a9936692f967a0f9b3copy hash to clipboard (diff)
builtin-merge.c
grep.c