Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-03 20:14:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

refactor: remove unused merge methods

Browse source
This commit is contained in:
louib 2023-08-06 16:37:51 -04:00 • committed by Jonathan White
parent cc0530ba46
commit f7fd3881e3
6 changed files with 3 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/TestMerge.h
View file

@ -35,15 +35,9 @@ private slots:
void testResolveGroupConflictOlder();
void testMergeNotModified();
void testMergeModified();
void testResolveConflictDuplicate();
void testResolveConflictEntry_Synchronize();
void testResolveConflictEntry_KeepLocal();
void testResolveConflictEntry_KeepRemote();
void testResolveConflictEntry_KeepNewer();
void testDeletionConflictEntry_Duplicate();
void testDeletionConflictEntry_Synchronized();
void testDeletionConflictEntry_KeepLocal();
void testDeletionConflictEntry_KeepRemote();
void testDeletionConflictEntry_KeepNewer();
void testMoveEntry();
void testMoveEntryPreserveChanges();