revert applyDiffTool change

NaccOll · NaccOll · commit 30e0eab58ea4 · 2025-09-10T10:04:12.000+08:00
diff --git a/src/core/tools/applyDiffTool.ts b/src/core/tools/applyDiffTool.ts
@@ -45,9 +45,12 @@ export async function applyDiffToolLegacy(
 					tmpDiff += `\n-------\n${search}`
 				}
 				if (startLine && search && replace) {
-					tmpDiff += `\n=======\n${replace}\n>>>>>>> REPLACE\n\n`
+					tmpDiff += `\n=======\n${replace}`
 				}
 			}
+			if (!block.partial) {
+				tmpDiff += "\n>>>>>>> REPLACE\n\n"
+			}
 			diffContent = tmpDiff
 			block.params.diff = diffContent
 		}

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,12 @@ export async function applyDiffToolLegacy(`
`45`	`45`	tmpDiff += `\n-------\n${search}`
`46`	`46`	`}`
`47`	`47`	`if (startLine && search && replace) {`
`48`		- tmpDiff += `\n=======\n${replace}\n>>>>>>> REPLACE\n\n`
	`48`	+ tmpDiff += `\n=======\n${replace}`
`49`	`49`	`}`
`50`	`50`	`}`
	`51`	`+ if (!block.partial) {`
	`52`	`+ tmpDiff += "\n>>>>>>> REPLACE\n\n"`
	`53`	`+ }`
`51`	`54`	`diffContent = tmpDiff`
`52`	`55`	`block.params.diff = diffContent`
`53`	`56`	`}`