Merge branch 'mg/replace-resolve-delete'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:38:32 +0000 (10:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:38:32 +0000 (10:38 -0800)
commit3a2c082...8326a219ce9d7e53d95e382ed3fb8b7c
tree43059b2...f7ba14a7493bdefc37894a47bb9c5aaacopy hash to clipboard (tree)
parent79a09bb...1cc919f5ea0992db358fb4b14ab2c226copy hash to clipboard (diff)
parent9dfc368...1b3f1a2669f0513676cc4d72ef1220a1copy hash to clipboard (diff)