Commit graph

10 commits

Author SHA1 Message Date
leo
5081d2fba2
fix: error occurs while using WinMerge as external diff tool with Single instance mode enabled (#842) 2024-12-27 17:40:34 +08:00
Dmitrij D. Czarkoff
f4618afee6
feature: switch WinMerge from 3-way to 2-way UI (#712) 2024-11-18 09:03:27 +08:00
leo
a8ae887320
fix: wrong merge command for Meld (#603)
Signed-off-by: leo <longshuang@msn.cn>
2024-10-27 16:56:38 +08:00
leo
cd9196bb84
feature: supports get avatar from avatars.githubusercontent.com
* move all images to `src/Resources/Images` folder
2024-08-02 18:06:45 +08:00
leo
d3d6889e25
feature: supports P4Merge as external merge/diff tool (#181) 2024-06-21 10:29:01 +08:00
leo
c56d0cf85e
refactor: external diff merge tool - supports to use difftool/mergetool settings from git config directly (#181) 2024-06-18 12:10:38 +08:00
leo
c9ce41aef3 feature: supports open in/diff with VSCodium (#102) 2024-05-03 21:54:10 +08:00
leo
217800c83a feature: support Meld as an external merge tool on Linux platform 2024-04-09 15:36:11 +08:00
leo
17fc7ab994 ux: add icons for external merge tools 2024-04-09 15:00:52 +08:00
leo
4882fd9d69 refactor: external tools and shells
* rename Models.ExternalMergeTools to Models.ExternalMerger
* supports Git Bash/PowerShell/Command Prompt/Default Shell in Windows Terminal
2024-04-09 10:41:37 +08:00