bash

유닉스 diff 명령의 결과를 차례로 다른 차이 대신 나란히 플롯 할 수 있습니까? 예는 아래를 참조하십시오.

    diff /tmp/test1  /tmp/test2
1,4c1,2
< asfdsadf
< asdfsad
< fsaf
< fdsadf
---
> asdfsafdsf
> saf
6,8d3
< sadf
< asdf
< sadf
10d4
< fasd
12,13c6,14
< sadfa
< fd
---
> sadf
> sadf
> sadf
> sadf
> sadf
> sadf
> sadf
> sadf
> safa

나는 다음과 같은 것을 갖고 싶다.

diff /tmp/test1  /tmp/test2
1,4c1,2
< asfdsadf       > asdfsafdsf
< asdfsad        > saf
< fsaf
< fdsadf
---
6,8d3
< sadf
< asdf
< sadf
10d4
< fasd
12,13c6,14
< sadfa               > sadf
< fd              > sadf
---               > sadf
              > sadf
              > sadf
              > sadf
              > sadf
              > sadf
              > safa

답변

-y, --side-by-side
       output in two columns

diff -y /tmp/test1  /tmp/test2

$ cat a                $ cat b
hello                  hello
my name                my name
is me                  is you

$ diff -y a b
hello                                                           hello
my name                                                         my name
is me                                                         | is you

diff -y --suppress-common-lines file1 file2

sdiff  file1 file2

diff -y file1 file2

vimdiff file1 file2

diff -y fileA.txt fileB.txt | colordiff

diff -y file1 file2