| Nikerabbit | |
| Dec 4 2017, 6:45 AM |
| F11169021: image.png | |
| Dec 4 2017, 6:45 AM |
In the screenshot, in the first block, the line that is identical except one level of indentation is shown as text coming from two different lines on the left side.
The second block is okay.
In the third block ); mysteriously is taken as added text.
git --word-diff=color does not have this issue.
Screenshot from https://gerrit.wikimedia.org/r/#/c/394917/1/api/ApiQueryContentTranslationSuggestions.php
Gerrit uses a java + codemirror (which is javascript). The merge view uses the google-diff-match-patch library https://code.google.com/archive/p/google-diff-match-patch/ .
https://github.com/codemirror/CodeMirror/blob/master/addon/merge/merge.js .
Upstream removed GWTUI (the old ui). I propose to decline this (or does it do the same in the new ui too?)