From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Aug 2009 11:13:04 +0000 (-0700)
Subject: Merge branch 'jk/maint-merge-msg-fix'
X-Git-Tag: v1.6.5-rc0~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b21f9e7f860620571667fba33ed511bed59dfb14;p=git.git

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

* 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
---

b21f9e7f860620571667fba33ed511bed59dfb14