git-merge: minor fix for no_trivial_merge_strategies.
authorJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 23:08:25 +0000 (15:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 23:08:25 +0000 (15:08 -0800)
commitde6f0de...506935811384a39fb0660095f5555e68
treeb477223...b86b378bcf6f8528816a561fc971291bcopy hash to clipboard (tree)
parentefa13f7...7ea1605deab3a6478fa0d0706c828170copy hash to clipboard (diff)
git-merge.sh