Merge branch 'jc/pull-signed-tag'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:30:42 +0000 (22:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:30:42 +0000 (22:30 -0800)
commitaf6b37fab1a97943c804f4983452c7fde5b0fbbe
tree8ca886b1a5d0d7032bb5393c14ac82fae2dfcfc3
parent2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa
parentf8246281af9adb0fdddbcc90d2e19cb5cd5217e5
Merge branch 'jc/pull-signed-tag'

* jc/pull-signed-tag:
  merge: use editor by default in interactive sessions

Conflicts:
Documentation/merge-options.txt
builtin/merge.c
t/test-lib.sh