merge: use editor by default in interactive sessions
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jan 2012 06:44:45 +0000 (22:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Jan 2012 22:34:55 +0000 (14:34 -0800)
commitf824628...af9adb0fdddbcc90d2e19cb5cd5217e5
treec9adbb2...536c1ce99cffa44ce3c99aef9075e9facopy hash to clipboard (tree)
parent0074d18...c0d816f9842d3e0e1cd0b26341715b37copy hash to clipboard (diff)
Documentation/git-merge.txt
Documentation/merge-options.txt
builtin/merge.c
t/test-lib.sh