Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 11238a9c7d fix readme master sergeych 2024-03-20 00:25:13 +0100
• 446a7adf6f v0.0.10 fix #1 fix #2 fix #3 fixed and enhanced merge sergeych 2024-03-20 00:08:20 +0100
• 6a67a4e840 Add broken test for merge conflict resolution order anzhu 2023-09-16 19:05:31 +0300
• fdffaa2f1d Add broken test anzhu 2023-09-07 15:14:48 +0300
• 64df8ed9f2 0.0.8-SNAPSHOT fixed block indexes in merge3 resultб yet again sergeych 2023-04-21 15:09:20 +0100
• d60f90160b Add test for merge3 filter anzhu 2023-04-21 16:33:31 +0300
• 2e19e8ca42 0.0.6-SNAPSHOT fixed block indexes in merge3 result sergeych 2023-04-11 13:20:34 +0100
• ce3987d009 Add 2 tests for merge indexes anzhu 2023-04-11 12:24:41 +0300
• 86d24c6a9a improved (removed) dependencies sergeych 2023-04-06 15:31:48 +0100
• 485afbbace added source indexes to merge3 results sergeych 2023-04-05 23:06:52 +0100
• a1c5d9ee88 removed conflict data from blocks as it is not needed and not yet implemented sergeych 2023-03-23 18:38:26 +0100
• 2249eb539a fixd tagret mvn repo sergeych 2023-03-21 13:58:03 +0100
• 08ce64796b some fixes in merge3 sergeych 2023-03-21 05:27:24 +0100
• 2262c66b63 added mrged blocks and README.md sergeych 2023-03-21 04:09:20 +0100
• 3f6a16224e initial commit: some diff algorithm sergeych 2023-03-21 03:34:46 +0100