merge: backport GIT_MERGE_AUTOEDIT support
commitd387868a7d29621e85e8c5c061d1f50586db74e5
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:39:10 +0000 (20 15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:39:10 +0000 (20 15:39 -0700)
tree0e94cb6cc9bd3615adf051107dd6ac071fa5b9c7
parenta46034819ecce6872bff099f3d75589f4d38c00c
merge: backport GIT_MERGE_AUTOEDIT support

Even though 1.7.9.x series does not open the editor by default
when merging in general, it does do so in one occassion: when
merging an annotated tag. And worse yet, there is no good way
for older scripts to decline this.

Backport the support for GIT_MERGE_AUTOEDIT environment variable
from 1.7.10 track to help those stuck on 1.7.9.x maintenance
track.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-options.txt
builtin/merge.c