Merge branch 'js/replace-edit-use-editor-configuration'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 19:59:07 +0000 (12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 19:59:07 +0000 (12:59 -0700)
"git replace -e" did not honour "core.editor" configuration.

* js/replace-edit-use-editor-configuration:
replace --edit: respect core.editor

1  2 
builtin/replace.c
Simple merge