aboutsummaryrefslogtreecommitdiffstats
path: root/README (unfollow)
Commit message (Expand)AuthorFilesLines
2 hoursAdd support for combining --merge and --symmetricHEAD1.3masterMattias Andrée1-1/+1
22 hoursAdd --symmetric1.2Mattias Andrée1-13/+35
3 daysAdd conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée1-1/+76
2026-02-22fix doc text1.0.5Mattias Andrée1-1/+1
2024-08-15Fix typoMattias Andrée1-1/+1
2024-08-15Add README and git-rediff.1Mattias Andrée1-0/+27