Files
Simon Lindholm ae05e362f7 Three-way diffs (#1147)
* Misc cleanups

* Three-way diffs

Fixes #93.

* Setting for three-way diffing mode

* fixes

* Error checking

* wording

* fix

* Help text

* Style the 2/3 button

* yarn lint

* make a smidge smaller

* make the 2/3 a tiny bit smaller

* Add -3/-b flag to editor settings

---------

Co-authored-by: Mark Street <streetster@gmail.com>
2024-03-26 15:57:16 +09:00
..
2024-03-26 15:57:16 +09:00
2022-09-19 23:08:19 +01:00
2022-07-03 23:44:24 +09:00
2022-10-22 12:42:46 +09:00
2022-07-29 11:41:20 -04:00