summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorLibravatar Ralf Thielow <ralf.thielow@gmail.com>2017-10-15 19:07:42 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-16 10:53:03 +0900
commit3247edbb1a8218f9c65f09a25d46572b224d096b (patch)
treebfc6bf3df561d90857f40e7baaf9abbee3bfcc63 /t/t7611-merge-abort.sh
parenti18n: add a missing space in message (diff)
downloadtgif-3247edbb1a8218f9c65f09a25d46572b224d096b.tar.xz
sequencer.c: fix and unify error messages in rearrange_squash()
When the write opertion fails, we write that we could not read. Change the error message to match the operation and remove the full stop at the end. When ftruncate() fails, we write that we couldn't finish the operation on the todo file. It is more accurate to write that we couldn't truncate as we do in other calls of ftruncate(). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions