Comments on: Merging and More with diff3

By: Andrés Chandía

Andrés Chandía — Tue, 24 Apr 2012 13:43:35 +0000

Sorry again, now (I have to put them i html code)
In diff if you do:
diff file1 file2 > file 3
cat file3 < Line1 (old line) > Line01 (new line)

How can you do that in diff3, I mean:
diff3 File0 file1 file2 > file3
having as output something like this:
cat file3 < Line 1 (file0) > Line1 (file1) | Line01 (file2)
I mean, I need the character at the beginning of the line.

Thanks

By: Andrés Chandía

Andrés Chandía — Tue, 24 Apr 2012 13:39:59 +0000

Sorry the previous post didn’t show the characters i was talking about, here you have them:

In diff if you do:
diff file1 file2 > file 3
cat file3
Line01 (new line)

How can you do that in diff3, I mean:
diff3 File0 file1 file2 > file3
having as output something like this:
cat file3
Line1 (file1)
| Line01 (file2)
I mean, I need the character at the beginning of the line.

Thanks

By: Andrés Chandía

Andrés Chandía — Tue, 24 Apr 2012 13:37:51 +0000

In diff if you do:
diff file1 file2 > file 3
cat file3 Line01 (new line)

How can you do that in diff3, I mean:
diff3 File0 file1 file2 > file3
having as output something like this:
cat file3 Line1 (file1) | Line01 (file2)
I mean, I need the character at the beginning of the line.

Thanks

By: satijar

satijar — Wed, 30 Nov -0001 00:00:00 +0000

very good info for linux users/sys administrators

By: sucool

sucool — Wed, 30 Nov -0001 00:00:00 +0000

Excellent information …thanks…..

By: avics

avics — Wed, 30 Nov -0001 00:00:00 +0000

I’ve doing diff3 like merges with emacs for more than 10 years. It works like a charm, especially since the emacs frontend shows diff’s on a character base as well.

By: 1sy8

1sy8 — Wed, 30 Nov -0001 00:00:00 +0000

How do you do that in emacs ? Splitting windows maybe ?