Display diff output side-by-side

Question

I use the version control system fossil. I'd like to view fossil diff's output side-by-side in Emacs. The output looks like this:

$ fossil diff
Index: test1.txt
==================================================================
--- test1.txt
+++ test1.txt
@@ -1,1 +1,1 @@
-Old text
+New text

Index: test2.txt
==================================================================
--- test2.txt
+++ test2.txt
@@ -1,1 +1,1 @@
-Old text 2
+New text 2

Is there a way to display this output side-by-side, perhaps with ediff?

@ChillarAnand Yes, it colors the text but it doesn't display it side-by-side. — Geier, Sep 22 '15 at 12:21
Do you want to see the original files, or just the parts that are covered by the diff? — Gilles 'SO- stop being evil', Sep 22 '15 at 20:38

score 3 · Accepted Answer · answered Dec 17 '15 at 11:27

3

You can try with the diffview package: https://github.com/emacsmirror/diffview

configuration

(require 'diffview)

execution

M-x diffview-current

answered Dec 17 '15 at 11:27

djangoliv

3,199
16
32

Display diff output side-by-side

1 Answers1