From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Sep 2010 16:43:43 +0000 (-0700)
Subject: Merge branch 'jn/merge-custom-no-trivial'
X-Git-Tag: v1.7.3-rc0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=460645a8c331196c3e5e61de4acf3f9c5803e335;p=git.git

Merge branch 'jn/merge-custom-no-trivial'

* jn/merge-custom-no-trivial:
  t7606: Avoid using head as a file name
  merge: let custom strategies intervene in trivial merges
  t7606 (merge-theirs): modernize style
---

460645a8c331196c3e5e61de4acf3f9c5803e335