git-merge knows some strategies want to skip trivial merges
authorJunio C Hamano <junkio@cox.net>
Sat, 18 Mar 2006 22:50:53 +0000 (14:50 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 20 Mar 2006 08:50:37 +0000 (00:50 -0800)
commit6ea2334...ce2962a5c76ed62a29fd17cb30954de2
treee722be2...a80a6bb52ef227c0ffa359202f2812d5copy hash to clipboard (tree)
parentfd662dd...00cded4b04b1154dc77cc989a5ddc5b8copy hash to clipboard (diff)
git-merge.sh