Details
-
Bug
-
Resolution: Fixed
-
Low
-
None
-
1.8.1
-
None
-
None
-
Severity 3 - Minor
Description
Steps to reproduce:
- Install (eg.) ImageMagick's "compare" in /usr/local/bin.
- Install AraxisMerge.
- Set up AraxisMerge as an "External Diff / Merge" under Preferences... > Diff
- Create a merge conflict in a repository.
- Right click and Resolve Merge Conflicts > Launch External Merge Tool
- Nothing happens.
This is because of the following:
- araxiscompare-w.sh
export PATH=~/bin:/usr/bin:/bin:/Applications/Araxis\ Merge.app/Contents/Utilities
- araxisgitmerge-w.sh
export PATH=~/bin:/Applications/Araxis\ Merge.app/Contents/Utilities:/usr/local/bin:/usr/bin:/bin:$PATH
- araxishgmerge-w.sh
export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/Applications/Araxis\ Merge.app/Contents/Utilities:$PATH
The current workaround is to change these scripts and place Applications/Araxis\ Merge.app/Contents/Utilities before /usr/local/bin
Attachments
Issue Links
- duplicates
-
SRCTREE-1590 Further help for wrong executables on assumed paths (Merge/Compare utilities)
- Gathering Impact
- is related to
-
SRCTREEWIN-7569 External Diff option not available in context menu
- Long Term Backlog