Orion Henry
|
bce30fa9b2
|
Merge branch 'experiment' into marks
|
2022-04-17 09:00:02 -04:00 |
|
Orion Henry
|
25afa0b12b
|
unmark() - 0.0.21
|
2022-03-21 13:36:01 -04:00 |
|
Orion Henry
|
0cf54c36a8
|
0.0.21
|
2022-03-17 19:15:21 -04:00 |
|
Orion Henry
|
3c3f411329
|
update to new autotransaction api
|
2022-02-24 18:43:44 -05:00 |
|
Blaine Cook
|
5eb5714c13
|
add failing test for marks handling in 3-way merge scenario
|
2022-02-24 16:24:17 -05:00 |
|
Blaine Cook
|
4f9b95b5b8
|
add test for merge behaviour of marks
|
2022-02-24 16:24:17 -05:00 |
|
Orion Henry
|
2ba2da95a8
|
attempt at new packaging
|
2022-02-22 12:11:49 -05:00 |
|
Orion Henry
|
561cad44e3
|
Revert "remove marks"
This reverts commit c8c695618b.
|
2022-02-22 12:11:49 -05:00 |
|
Orion Henry
|
c8c695618b
|
remove marks
|
2022-02-10 11:42:15 -05:00 |
|
Orion Henry
|
d1b0d41239
|
move marks into its own test
|
2022-02-10 11:17:15 -05:00 |
|