commit aaef19b43a34ed335737d733fbfea51056f2e2bb from: Stefan Sperling date: Fri Oct 08 08:33:30 2021 UTC sync files from diff.git 346d4986568ffbcfdc53cce45dd8a468535a68f2 commit - e7ffb0b07b18c20ebb619f3879602d629d0fbbc6 commit + aaef19b43a34ed335737d733fbfea51056f2e2bb blob - 1c9b6d17294abf78edffde84b7937856f2620bb1 blob + 42d4d5b39ef5a587321d90c1b95ef4f616e882b3 --- lib/diff_output_edscript.c +++ lib/diff_output_edscript.c @@ -45,8 +45,10 @@ output_edscript_chunk(struct diff_output_info *outinfo left_start = 0; else if (left_len == 0 && cc->left.start > 0) left_start = cc->left.start; - else + else if (cc->left.end > 0) left_start = cc->left.start + 1; + else + left_start = cc->left.start; right_len = cc->right.end - cc->right.start; if (right_len < 0) @@ -55,8 +57,10 @@ output_edscript_chunk(struct diff_output_info *outinfo right_start = 0; else if (right_len == 0 && cc->right.start > 0) right_start = cc->right.start; - else + else if (cc->right.end > 0) right_start = cc->right.start + 1; + else + right_start = cc->right.start; if (left_len == 0) { /* addition */