From: Junio C Hamano <junkio@cox.net>
Date: Fri, 16 Feb 2007 23:08:46 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53756f290b94a0f8ee7021713fa63540d1a7e4e8;p=thirdparty%2Fgit.git

Merge branch 'maint'

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

53756f290b94a0f8ee7021713fa63540d1a7e4e8