v1.0.1

jorio released this 03 Dec 22:39

· 871 commits to master since this release

c3bd14e

Friendlier ConflictView UI
Improve 3-way merging with external merge tools when there's no ancestor in the conflict
Distinguish submodules and subtrees in SpecialDiff verbiage
Fix discarding untracked non-submodule subtrees (#1)
First Flatpak release

Assets 3