![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:30:42 +0000 (22:30 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:30:42 +0000 (22:30 -0800) | ||
| commit | af6b37fab1a97943c804f4983452c7fde5b0fbbe | |
| tree | 8ca886b1a5d0d7032bb5393c14ac82fae2dfcfc3 | tree | snapshot |
| parent | 2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa | commit | diff |
| parent | f8246281af9adb0fdddbcc90d2e19cb5cd5217e5 | commit | diff |
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag:
merge: use editor by default in interactive sessions
Conflicts:
Documentation/merge-options.txt
* jc/pull-signed-tag:
merge: use editor by default in interactive sessions
Conflicts:
Documentation/merge-options.txt
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| t/test-lib.sh | diff1 | | diff2 | | blob | history |