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