Thread (5 messages) flat view 5 messages, 4 authors, 2016-06-15

Re: Side-by-side diff and patch visualization

From: David Kastrup <hidden>
Date: 2016-06-15 22:43:35

Wincent Colaiuta [off-list ref] writes:
Does anybody know of any tools for doing side-by-side visualizations
of diffs and patches which work well with Git?

So, can anyone recommend a tool which can do this kind of side-by- 
side visualization and plays nicely with Git?
I use M-x ediff-revision RET in Emacs for this.  There is also M-x
smerge-ediff RET for resolving a file with merge conflict markers, and
M-x ediff-merge-revisions-with-ancestor RET.

The side-by-side layout is chosen by typing | into the control window
for the merge.

Looking at a patch in respect of two versions can be done with M-x
ediff-patch-file RET.

-- 
David Kastrup
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help