enhance(sync): make smart merge the default option

logseq · Oct 31, 2023 · d39a61a · d39a61a
1 parent cf82981
commit d39a61a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs
@@ -281,7 +281,7 @@
 
      :ui/loading?                           {}
      :feature/enable-sync?                  (storage/get :logseq-sync-enabled)
-     :feature/enable-sync-diff-merge?       (storage/get :logseq-sync-diff-merge-enabled)
+     :feature/enable-sync-diff-merge?       ((fnil identity true) (storage/get :logseq-sync-diff-merge-enabled))
 
      :file/rename-event-chan                (async/chan 100)
      :ui/find-in-page                       nil