--- /path/to/mysource.h 2016-09-28 18:34:54.918709150 -0400
+++ /path/to/tmp.6365.102 2016-09-29 11:05:32.228946564 -0400
@@ -16,6 +16,7 @@
we are same in all branches
same as everywhere
+ added line
more same
@@ -28,7 +29,12 @@
here you go the conflict
+>>>> ORIGINAL //stream/version/path/to/mysource.h#1
+ the original line is here
+==== THEIRS //stream/version/path/to/mysource.h#2
+ their line is here
+==== YOURS /path/to/mysource.h
my line is here
+<<<<
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) e: e
--- /path/to/mysource.h 2016-09-28 18:34:54.918709150 -0400
+++ /path/to/tmp.6365.102 2016-09-29 11:05:32.228946564 -0400
@@ -16,6 +16,7 @@
we are same in all branches
same as everywhere
+ added line
more same
@@ -28,7 +29,12 @@
here you go the conflict
+>>>> ORIGINAL //stream/version/path/to/mysource.h#1
+ the original line is here
+==== THEIRS //stream/version/path/to/mysource.h#2
+ their line is here
+==== YOURS /path/to/mysource.h
my line is here
+<<<<
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) e: e
Now it is possible to fix this typing e. It will open an editor where we can compare the different versions in between the +==== lines and +<<<< lines.
Once we are done with editing we can accept by typing a.
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) ae: a
The whole process can be done from remote command/shell window. So there is no X-server is needed.
I have something called diff3, which has a merge option. I'm not sure where it came from and I have not used it. diff3 -m file1 file2 file3. Take it for what it's worth.
发布评论
评论（4）
我更喜欢 meld 它功能强大但轻量级，并且不像 Kdiff3 那样没有 KDE 依赖。
看看官方主页
I prefer meld It is powerful yet lightweight and has no KDE deps as Kdiff3 does.
Look at official homepage
如果您坚决不使用 X 客户端，请尝试查看 emacs 的 ediff。这适用于文本模式（尽管在 X 中更容易）。
If you're dead set on not using an X client, try taking a look at emacs' ediff. That works in text mode (though it's easier in X).
我猜你正在谈论用三向差异工具解析文件。不同的版本都是你的，
做到这一点，需要在 Linux 中进行一些设置。我有一个 .p4config 文件，它定义了我更喜欢的 diff 工具。
这里
P4DIFF设置为diff -u。为了使整个事情正常工作，需要通过环境变量将.p4config文件插入到 perforce。现在是最佳点。我们实际上需要通过
p4 resolve命令进行解析。一旦我们这样做，就会表明存在冲突，因为有人修改了我们正在工作的原始版本。所以它提示我们采取行动。
我们可以通过按
d来查看差异。现在可以修复这个输入
e。它将打开一个编辑器，我们可以在其中比较+====行和+<<<<<行之间的不同版本。完成编辑后，我们可以通过输入
a来接受。整个过程可以从远程命令/shell 窗口完成。所以不需要X-server。
I guess you are talking about resolving files in three way diff tool. The different versions are,
Now, to do that a little setup is needed in linux. I have a
.p4configfile that defines my preferable diff tool.Here
P4DIFFis set todiff -u. To make the whole thing work the.p4configfile needs to be plugged to perforce by environment variable.Now it is the sweet-spot. We need to actually do the resolve by
p4 resolvecommand.As soon as we do that, it shows that there is conflict as someone modified the original version we were working. So it prompts for our action.
We can see the diff by pressing
d.Now it is possible to fix this typing
e. It will open an editor where we can compare the different versions in between the+====lines and+<<<<lines.Once we are done with editing we can accept by typing
a.The whole process can be done from remote command/shell window. So there is no X-server is needed.
我有一个名为
diff3的东西，它有一个合并选项。我不确定它是从哪里来的，我也没有使用过它。diff3 -m file1 file2 file3。接受它的价值。顺便说一句，我正在运行 OpenSuSE 11.2，如果有帮助的话。
I have something called
diff3, which has a merge option. I'm not sure where it came from and I have not used it.diff3 -m file1 file2 file3. Take it for what it's worth.Btw, I'm running OpenSuSE 11.2, if that helps.