[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug in diff3 ?
From: |
treffehn |
Subject: |
bug in diff3 ? |
Date: |
Tue, 9 Dec 2003 15:46:54 +0100 |
Hello
Maybe its a bug maybe not.
diff3 (GNU diffutils) 2.8.1
try to merge these files
MINE:
1
2
3
4
5aa
6
7
8
9
OLD:
1
2
3
4
5
6
7
8
9
YOURS:
1
2
3
4
5
6bb
7
8
9
I expect this:
1
2
3
4
5aa
6bb
7
8
9
but whatever I do I don't get it.
diff3 --merge MINE OLD YOURS
1
2
3
4
<<<<<<< 1
5aa
6
||||||| 2
5
6
=======
5
6bb
>>>>>>> 3
7
8
9
diff3 --ed --merge MINE OLD YOURS
1
2
3
4
5
6bb
7
8
9
regards
Thomas Treffehn
- bug in diff3 ?,
treffehn <=