[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Unexpected conflict detected by diff3
|
From: |
Křištof Želechovski |
|
Subject: |
Unexpected conflict detected by diff3 |
|
Date: |
Wed, 6 Apr 2011 00:05:52 +0200 |
|
User-agent: |
KMail/1.13.6 (Linux/2.6.37.1-1.2-desktop; KDE/4.6.0; x86_64; ; ) |
I present to you three files: p, m, v, where p is the original file. I am
surprised that they are in conflict, since the sequence (p => v => m) is
strictly incremental. I believe that the conflict is bogus.
== p ==
%patch69 -p0
popd
== m ==
%patch69 -p0
%patch674733 -p1
popd
pushd xedit-*
popd
== v ==
%patch69 -p0
%patch674733 -p1
popd
== diff3 -m m p v ==
%patch69 -p0
<<<<<<< m
%patch674733 -p1
popd
pushd xedit-*
||||||| p
=======
%patch674733 -p1
>>>>>>> v
popd
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Unexpected conflict detected by diff3,
Křištof Želechovski <=