Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 04:45:14 +0000 (21:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Mar 2009 04:45:14 +0000 (21:45 -0700)
commitd9b0443...d238be1fe75ef97e3455c65ca72a7fa0
treee9e0d7d...e46d47575302935f5a64bd1444c14152copy hash to clipboard (tree)
parent54e7e78...1b75741ba745e783dd5c5f488f377438copy hash to clipboard (diff)
parent4cc8d6c...2db1f82b3c98468806d2ee54c7e037cacopy hash to clipboard (diff)