From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2009 19:05:57 +0000 (-0700)
Subject: Merge branch 'jk/maint-merge-msg-fix' into maint
X-Git-Tag: v1.6.4.2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bd30037e65c53112dd84c2712750e152b2f7f854;p=git.git

Merge branch 'jk/maint-merge-msg-fix' into maint

* jk/maint-merge-msg-fix:
  merge: indicate remote tracking branches in merge message
  merge: fix incorrect merge message for ambiguous tag/branch
  add tests for merge message headings
---

bd30037e65c53112dd84c2712750e152b2f7f854