> Of course, with auto-format that we currently apply in the UI, we can't even
> visualize those diff (grrr! I hate those auto-format)

If we are able to identify when it only differs by format, then we
could have it ignore the "diff with pretty print" preference in that
case and always show the diff of the actual texts..

> ... snip ...
> There's another problem above:
> Rest Accept is for accepting the remote changes
> Accept same source is for accepting the local...
>
> That can't be the same word, much confusing!

+1