Introduce synchronize merge method

* Create history-based merging that keeps older data in history instead of discarding or deleting it
* Extract merge logic into the Merger class
* Allows special merge behavior
* Improve handling of deletion and changes on groups
* Enable basic change tracking while merging
* Prevent unintended timestamp changes while merging
* Handle differences in timestamp precision
* Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...)
* Introduce Clock class to handle datetime across the app

Merge Strategies:
* Default (use inherited/fallback method)
* Duplicate (duplicate conflicting nodes, apply all deletions)
* KeepLocal (use local values, but apply all deletions)
* KeepRemote (use remote values, but apply all deletions)
* KeepNewer (merge history only)
* Synchronize (merge history, newest value stays on top, apply all deletions)

1 files changed, 0 insertions, 10 deletions

diff --git a/tests/TestGlobal.h b/tests/TestGlobal.h
index 9889a4434..958034293 100644
--- a/tests/TestGlobal.h
+++ b/tests/TestGlobal.h
@@ -43,14 +43,4 @@ namespace QTest
 
 } // namespace QTest
 
-namespace Test
-{
-
-    inline QDateTime datetime(int year, int month, int day, int hour, int min, int second)
-    {
-        return QDateTime(QDate(year, month, day), QTime(hour, min, second), Qt::UTC);
-    }
-
-} // namespace Test
-
 #endif // KEEPASSXC_TESTGLOBAL_H