It would be nice to have a function that ignores
changes in whitespace completely.
I like the way it is implemented in Emacs ediff-mode:
choose "ignore whitespace differences" and "goto next
diff" skips all whitespace diffs.
For merge it could be implemented as follows:
- as a precondition: if only whitespace difference,
choose (A|B|C)
- as postcondition: (like in xxdiff) select all
unselected from (A|B|C)
so "next diff" and "next conflict" only consider
non-whitespace diffs (if "ignore whitespace" is on) and
the whitespace regions can be automatically selected.
Logged In: YES
user_id=584435
Implemented in 0.9.80.
New menu-entries:
- Choose A/B/C for all unsolved conflicts.
- Choose A/B/C for all unsolved whitespace conflicts.
- Show White Space
New option:
- White-space 2/3 file merge default.
Thanks for this nice suggestion.