Merge branch 'jc/maint-reset-unmerged-path' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700)
commit7aa5089...dda0360b9cbbe23e723a5aee461e1d71
treefaa92da...147f6ffee7057a9e3afeaa2a6fca398ccopy hash to clipboard (tree)
parentb5e104a...e69f224b89a849fa1e9b4064a36c2f4bcopy hash to clipboard (diff)
parentff00b68...f203eb39876b57404916b4c54b6032c6copy hash to clipboard (diff)
diff-lib.c