From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Jan 2010 00:08:19 +0000 (-0800)
Subject: Merge branch 'jc/branch-d'
X-Git-Tag: v1.7.0-rc0~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=630724ca79b1a7893a8d9c04367eae857ff1a7b0;p=git.git

Merge branch 'jc/branch-d'

* jc/branch-d:
  branch -d: base the "already-merged" safety on the branch it merges with
---

630724ca79b1a7893a8d9c04367eae857ff1a7b0