Commitc236dba

committed

fixup

1 parenteb5f4da commitc236dbaCopy full SHA for c236dba

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ func formatChanges(_ changesByPath: [String: (alpha: [Core_Change], beta: [Core_`
`142`	`142`	`changes.alpha[0].new.kind==.file,`
`143`	`143`	`changes.beta[0].new.kind==.file`
`144`	`144`	`{`
`145`		- result+="File:`\(formatPath(path))`\n"
	`145`	`+ result+="File:'\(formatPath(path))'\n"`
`146`	`146`	`continue`
`147`	`147`	`}`
`148`	`148`	// Friendly message for `<non-existent -> !<non-existent>` conflicts
`@@ -152,15 +152,15 @@ func formatChanges(_ changesByPath: [String: (alpha: [Core_Change], beta: [Core_`
`152`	`152`	`changes.beta[0].hasNew`
`153`	`153`	`{`
`154`	`154`	`result+="""`
`155`		- An entry,`\(formatPath(path))`, was created on both endpoints that does not match.
	`155`	`+ An entry,'\(formatPath(path))', was created on both endpoints that does not match.`
`156`	`156`	`You can resolve this conflict by deleting one of the entries.\n`
`157`	`157`	`"""`
`158`	`158`	`continue`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`letformattedPath=formatPath(path)`
`163`		`- result+="Path:\(formattedPath)\n"`
	`163`	`+ result+="Path:'\(formattedPath)'\n"`
`164`	`164`
`165`	`165`	`// TODO: Local & Remote should be replaced with Alpha & Beta, once it's possible to configure which is which`
`166`	`166`

Comments

(0)