"리눅스 diff3"의 두 판 사이의 차이

2015년 9월 5일 (토) 00:14 판

[root@zetawiki ~]# cat a.txt
hello
world
[root@zetawiki ~]# cat b.txt
hello
world!
[root@zetawiki ~]# cat c.txt
hello
world
hello

[root@zetawiki ~]# diff3 a.txt b.txt c.txt
====
1:2c
  world
2:2c
  world!
3:2,3c
  world
  hello

[root@zetawiki ~]# diff3 a.txt b.txt c.txt -A
2a
||||||| b.txt
world!
=======
world
hello
>>>>>>> c.txt
.
1a
<<<<<<< a.txt
.

@@ 5번째 줄: / 5번째 줄: @@
 *세 파일의 차이를 보여줌
+==예시==
 <source lang='cli'>
 [root@zetawiki ~]# cat a.txt
-hello world
+hello
+world
 [root@zetawiki ~]# cat b.txt
-hello world
+hello
+world!
 [root@zetawiki ~]# cat c.txt
-hello word
+hello
+world
+hello
+</source>
+<source lang='cli'>
 [root@zetawiki ~]# diff3 a.txt b.txt c.txt
-====3
+====
-:1c
+:2c
-:1c
+  world
-   hello world
+:2c
-:1c
+   world!
-   hello word
+:2,3c
+   world
+  hello
+</source>
+<source lang='cli'>
+[root@zetawiki ~]# diff3 a.txt b.txt c.txt -A
+a
+||||||| b.txt
+world!
+=======
+world
+hello
+>>>>>>> c.txt
+.
+a
+<<<<<<< a.txt
+.
 </source>