Merge branch 'jk/add-e-kill-editor' into next
commit9e01174a1d9362dc748df4f40b7c9564a36806b5
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:40:11 +0000 (19 13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:40:11 +0000 (19 13:40 -0700)
tree470db5a271c2cd8bdea385dfc0349b62943c290d
parent12f90590df025ca0b1800c8feb09d2abdfc73d50
parentcb64800d83ace6fecb8701151cfdb6ed0712702c
Merge branch 'jk/add-e-kill-editor' into next

"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