diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-11-08 14:06:52 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-11-22 17:05:02 -0800 |
| commit | e97c9ad96b60d51b0b3852aaaff146015d01cb62 (patch) | |
| tree | ea89e1bbea0b444ab45c5859beb13016aa082882 /git-merge-one-file.sh | |
| parent | Port git commit to C. (diff) | |
| download | tgif-e97c9ad96b60d51b0b3852aaaff146015d01cb62.tar.xz | |
launch_editor(): read the file, even when EDITOR=:
Earlier we just returned in case EDITOR=: but the message stored
in the file was not read back. Fix this, at the same time
simplifying the code as suggested by Johannes Sixt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions