|
If you were logged in you would be able to see more operations.
|
|
|
|
|
| Component/s: |
Diff/Merge
|
| Affects Version/s: |
None
|
| Fix Version/s: |
None
|
|
|
Original Estimate:
|
Unknown
|
Remaining Estimate:
|
Unknown
|
Time Spent:
|
Unknown
|
|
Environment:
|
Mac OS X 10.4.8
JDK 1.5.0_06
Mac OS X 10.4.8
JDK 1.5.0_06
|
|
| Build: |
6,148
|
| Severity: |
Low
|
|
When doing a three way merge, typically due to a version control conflict, there is no way to ignore whitespace differences, unlike in the standard diff window. This means that if one of the conflicting versions have whitespace changes (often line-endings) along with real code changes it is very hard to do the merge.
|
|
Description
|
When doing a three way merge, typically due to a version control conflict, there is no way to ignore whitespace differences, unlike in the standard diff window. This means that if one of the conflicting versions have whitespace changes (often line-endings) along with real code changes it is very hard to do the merge. |
Show » |
|
New Feature
To Be Discussed
Normal
Allow option to ignore whitespace in three way merge
Severity should be changed to HIGH!
/Jonas