summaryrefslogtreecommitdiff
path: root/ws.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-07-22 21:48:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-22 22:38:22 (GMT)
commitb810cbbde9232cbe9a3841edccc5b606bbd3a82e (patch)
treec79f6c67be6dad7a57996008ec94c668e0f68a54 /ws.c
parent55d5d5bab7c3f9ab6310b9cf436a7935d7d32165 (diff)
downloadgit-b810cbbde9232cbe9a3841edccc5b606bbd3a82e.zip
git-b810cbbde9232cbe9a3841edccc5b606bbd3a82e.tar.gz
git-b810cbbde9232cbe9a3841edccc5b606bbd3a82e.tar.bz2
diff --cc: a lost line at the beginning of the file is shown incorrectly
When combine-diff inspected the diff from one parent to the merge result, it misinterpreted a header in the form @@ -l,k +0,0 @@. This hunk header means that K lines were removed from the beginning of the file, so the lost lines must be queued to the sline that represents the first line of the merge result, but we incremented our pointer incorrectly and ended up queuing it to the second line, which in turn made the lossage appear _after_ the first line. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions