Andrew's git / gitweb.git / diff
?
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)
* maint:
git-merge: minor fix for no_trivial_merge_strategies.

Trivial merge