Merge branch 'maint'
* maint: git-merge: minor fix for no_trivial_merge_strategies.
Junio C Hamano committed
Feb 16, 2007 at 15:08 UTC
53756f290b94a0f8ee7021713fa63540d1a7e4e8
No changes.
* maint: git-merge: minor fix for no_trivial_merge_strategies.
No changes.