diff options
Diffstat (limited to 'lib/mergetool.tcl')
| -rw-r--r-- | lib/mergetool.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index e688b016ef..f2fa439305 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -293,7 +293,7 @@ proc merge_tool_get_stages {target stages} { foreach fname $stages { if {$merge_stages($i) eq {}} { file delete $fname - catch { close [open $fname w] } + catch { close [safe_open_file $fname w] } } else { # A hack to support autocrlf properly git checkout-index -f --stage=$i -- $target |