enhance(sync): create version files when sync conflict

This commit is contained in:
rcmerci
2022-05-13 17:23:30 +08:00
committed by Andelf
parent d3acc42105
commit 7808612444
4 changed files with 148 additions and 39 deletions

View File

@@ -10,7 +10,7 @@
(defn diff
[s1 s2]
(-> ((gobj/get jsdiff "diffLines") s1 s2)
(-> ((gobj/get jsdiff "diffLines") s1 s2 (clj->js {"newlineIsToken" true}))
bean/->clj))
(def inline-special-chars