three-way file diff fallback for two-way diff tools
Created originally on Bitbucket by Anonymous
Using TortoiseMerge, visual diff on file in merged revision doesn't respect the original source of the change (or the 'other' button). It just diffs with the first parent.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information