Fix 3-way merge test failing on macOS
In macOS, /tmp is a symlink to /private/tmp. Git expands the worktree path to the evaluated path, so we need to do that in the test for the comparison to be correct.
Closes #3349 (closed)
In macOS, /tmp is a symlink to /private/tmp. Git expands the worktree path to the evaluated path, so we need to do that in the test for the comparison to be correct.
Closes #3349 (closed)