aboutsummaryrefslogtreecommitdiffstats
path: root/t/common.sh (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Make ^L redrawHEAD1.3.1masterMattias Andrée5 days1-0/+4
| | | | Signed-off-by: Mattias Andrée <m@maandree.se>
* Add --symmetric1.2Mattias Andrée2026-09-241-1/+2
| | | | Signed-off-by: Mattias Andrée <m@maandree.se>
* Add conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée2026-09-221-0/+165
Signed-off-by: Mattias Andrée <m@maandree.se>