Merge branch 'jk/add-e-kill-editor'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:55 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:55 +0000 (12:41 -0700)
commit29b2041c2a91d2f80afa9d4e0f6eeb77a3ff5bc6
treee0ba066f9c04441aef5d34c41e24751415233da7
parent935d93764466c52cae7218c13bde93043bd609bd
parentcb64800d83ace6fecb8701151cfdb6ed0712702c
Merge branch 'jk/add-e-kill-editor'

"git add -e" did not allow the user to abort the operation by
killing the editor.

* jk/add-e-kill-editor:
  add: check return value of launch_editor
builtin/add.c