|
|
|
@ -113,7 +113,7 @@ $ difft file_with_conflicts.js
|
|
|
|
|
|
|
|
|
|
|
|
No. AST merging is a hard problem that difftastic does not address.
|
|
|
|
No. AST merging is a hard problem that difftastic does not address.
|
|
|
|
|
|
|
|
|
|
|
|
AST diffing is a also lossy process from the perspective of a text
|
|
|
|
AST diffing is a lossy process from the perspective of a text
|
|
|
|
diff. Difftastic will ignore whitespace that isn't syntactically
|
|
|
|
diff. Difftastic will ignore whitespace that isn't syntactically
|
|
|
|
significant, but merging requires tracking whitespace.
|
|
|
|
significant, but merging requires tracking whitespace.
|
|
|
|
|
|
|
|
|
|
|
|
|