Merge branch 'maint'
* maint: rebase -X: do not clobber strategy
Junio C Hamano committed
Nov 15, 2010 at 11:00 UTC
d6b634fafdb5570d9c25d5176d3d32fe0b22530d
No changes.
* maint: rebase -X: do not clobber strategy
No changes.