pull and update should accept --show-base

[Stefan Monnier]

The merges that take place only in the working directory should also support 3-way conflict markers, as used by the --show-base argument in "merge".
I'd even go as far as to say that --show-base should always be the default (when possible) because it provides much better information, which is important to be able to resolve conflicts efficiently and safely.

[Stefan Monnier (monnier)]

Any news on this?

[Wouter van Heyst (larstiq)]

The title in combination with the body confuse me, could you explain in more detail what it is you think should be done?

[Stefan Monnier (monnier)]

I don't know what more you want to know. Currently "update" and "pull" do a 3-way merge and represent the remaining conflicts with 2-way conflict markers. This should be changed to use 3-way conflict markers instead, either by default or via a "--show-base" argument.

[Martin Pool (mbp)]

I agree, that would be pretty nice. @wouter I think the description is clear too.

This should be fairly easy if someone wants to tackle it, just by copying the appropriate option setting from merge.