Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2009 07:46:20 +0000 (00:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2009 07:46:20 +0000 (00:46 -0700)
commit3e73cb2...48cc4044905455a9936692f967a0f9b3
tree9b4030b...5e8b69e40f5de0ec00dd1ba2465a2f44copy hash to clipboard (tree)
parentcc13719...519a8ddbc0514da088fb012bea40df51copy hash to clipboard (diff)
parentc922b01...54c4bebe84daeacf014cfbc8dc68479bcopy hash to clipboard (diff)
builtin-merge.c
grep.c
t/t7002-grep.sh