Code

Merge branch 'jc/branch-d'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:19 +0000 (16:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:19 +0000 (16:08 -0800)
* jc/branch-d:
  branch -d: base the "already-merged" safety on the branch it merges with

1  2 
builtin-branch.c

Simple merge