6 Commits

Author	SHA1	Message	Date
fyears	f256936bae	slightly optimize two way merge	2024-07-13 23:19:39 +08:00
fyears	6ed04a651b	simplify merge file	2024-07-13 23:11:54 +08:00
fyears	1012bf3d09	remove dup files	2024-07-13 16:31:09 +08:00
fyears	3c85fff17c	fix bug in smart conflict and encryption	2024-07-13 13:57:12 +08:00
fyears	e74e49538e	more logic for potentially the same files in smart conflict	2024-06-29 00:14:53 +08:00
fyears	06dad54d4c	pro and smart conflict	2024-05-27 00:33:49 +08:00