Start the merging-rebase to 00c598b3f2

Browse Source

The only reason for this merging rebase is that upstream's pu, next
*and* master now have a diverging version of the builtin-difftool
patch series, making it harder to rebase on top of those integration
branches as well as onto the -rc versions.

So let's replace v4 of that patch series with the most recent one, and
add an extra patch on top that re-instates the "let the user opt-in
to use the builtin difftool" until v2.12.0 comes out.

This commit starts the rebase of 00c598b3f2 to 00c598b3f2

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

...

This commit is contained in:

Johannes Schindelin

2017-02-21 14:51:25 +01:00

parent 00c598b3f2 116813629e

commit 7f6e82d4dc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available