Merge "SideBySide2: Add "or [x] entire file" context option"