On Sun, 2 Dec 2018 15:06:37 +0100
Guillem Jover <[email protected]> wrote:
> - There is a desire to get 3-way merge support. This is currently
> just unreliable, as we do not keep all the information required.
> I'd rather not spend time on this until the conffiledb work is
> merged, which I just need to sit down and do. :)
3way could be fun eventually, but a quick win rightnow surely is to
just allow a user to hit a key to do the equivalent of the vimdiff (or
ediff or whatever tool) they're already using. I'd be perfectly happy
for the actual command invoked to be from a config file etc... I only
hardcoded 'vimdiff' in my original patch as a quick demonstration of
the behaviour I wanted.
Really this is just about saving myself some keystrokes. I'd rather hit
e
than
z vimdiff /etc/sshd/ssh_config{,.dpkg_new}
...
fg
every time. There's no complicated questions about 3way diff in this.
--
Paul "LeoNerd" Evans
[email protected] | https://metacpan.org/author/PEVANS
http://www.leonerd.org.uk/ | https://www.tindie.com/stores/leonerd/
