Is there a command-line equivalent to kdiff3 that allows selective merging?

Question

kdiff3 is a GUI diff tool that allows you to create a diff of two/three files and selectively choose which lines make up the merged file. Is there a command-line equivalent?

Gilles Quénot · Accepted Answer · 2013-05-06T22:52:22.320

6

You should try

vimdiff file1 file2

Ex :

enter image description here

You can select lines (from command mode to visual mode) with shift+v, copy with yy, paste with p and switch into files with ctrl+ww

See http://vimdoc.sourceforge.net/htmldoc/diff.html

edited May 06 '13 at 22:52

answered May 06 '13 at 22:40

Gilles Quénot

173,512
41
224
223

To navigate: `]c` next change, `[c` previous change, `dp` 'diff put' to other buffer, `do` 'diff obtain' from other buffer – 79E09796 Oct 06 '16 at 16:16

score 2 · Answer 2 · answered May 06 '13 at 22:42

2

Yes, vimdiff (quick tutorial linked) is quite good at it. Being part of VIM, you will have to learn the key strokes you need to accept or refuse changes.

answered May 06 '13 at 22:42

Stefano Sanfilippo

32,265
7
79
80

Is there a command-line equivalent to kdiff3 that allows selective merging?

2 Answers2

Linked