https://community.atlassian.com/forums/Sourcetree-questions/When-merging-with-FileMerge-and-resolving-conflicts-Sourcetree/qaq-p/1760980
When merging with FileMerge and resolving conflict...
Jul 27, 2021 - I'm using Sourcetree v4.1.2 and I'm seeing this behavior when merging files. If I run from Terminal the `git mergetool path-to-file` command,
mergingresolvingconflict