Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 23:08:46 +0000 (15:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 23:08:46 +0000 (15:08 -0800)
commit53756f290b94a0f8ee7021713fa63540d1a7e4e8
tree53ba4f90775e57fc7d0eec6d3ef2fbb4dcb7b393
parentaf99711cd84c30a16450f73dbc21ba9f9f9803e6
parentde6f0def506935811384a39fb0660095f5555e68
Merge branch 'maint'

* maint:
  git-merge: minor fix for no_trivial_merge_strategies.