aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add --symmetricHEADmasterMattias Andrée3 hours1-0/+33
* Add conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée2 days1-4/+206
* First commitMattias Andrée2024-08-151-0/+37