From: Junio C Hamano <junkio@cox.net>
Date: Sun, 26 Mar 2006 08:22:48 +0000 (-0800)
Subject: Merge branch 'jc/merge'
X-Git-Tag: v1.3.0-rc1~4^2~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=692c7fc9cb81a2f68b23199d5b8612494fe4d317;p=git.git

Merge branch 'jc/merge'

* jc/merge:
  git-merge knows some strategies want to skip trivial merges
---

692c7fc9cb81a2f68b23199d5b8612494fe4d317