???? ???? ?? ??? ??? ???? ?? ?????? ??? ??? ??? ??? ? ?? ?? ? ??? ???? ?? ?????.

Linux? ? ??? ??? ??? ? ?? ??? ??? Diff ?????. ? ??? ? ??? UNIX ?? ? ?? ?? ???? ? DIFF? ??? ?? ???? ??????.

Linux?? ??? ??? ? ?? ?? ?? ??? ???? ????? ?? ?? ?? ??? ??? ???? ?? ??? ??? ??? ??? ?? ? GUI DIFF ??? ?? ???.

1. diff ??

? ??? ??? ???? ???? ?? Unix ?? ? ???? ???? ????. Diff ? ???? ???? ?? ? ???? Linux ???? ?? ???? ??? ???? ???? ? ??? ?????.

? ??? ???? ???? ?????.

 $ diff file1.txt file2.txt

Diff ? ?? ??? ???? ?? ??? ? ????.

 # Man Diff

??? ????? DIFF ?? ? ??? ????.

Colordiff ??

Colordiff ? Diff ? ??? ??? ????? ?? ? ?? ?? ????? Perl ???????. ??? ?? ??? ? ???? ????.

YUM, DNF ? APT-GET ?? APT?? ?? ??? ??? ??? ???? Linux ???? Colordiff? ??? ? ????.

 $ sudo apt colordiff [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ Sudo Yum Colordiff [ <strong>Rhel/Centos/Fedora</strong> ? <strong>Rocky/Almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/Colordiff [ <strong>Gentoo Linux</strong> ??]
$ sudo apk add colordiff [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S Colordiff [ <strong>Arch Linux</strong> ]
$ Sudo Zypper ?? Colordiff [ <strong>OpenSuse</strong> ]    

????? ?? ??? ?????.

 $ colordiff file1.txt file2.txt

????? Colordiff ? ?? ??? ??? ? ????.

 # Man Colordiff

WDIFF ??

WDIFF ????? ???? ??? ???? ? ???? ??? ???? diff ?????. ? ????? ??? ??? ??? ??? ? ?? ???? ??? ? ?? ?????.

Linux ???? WDIFF? ????? ??????.

 $ sudo apt install wdiff [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ Sudo Yum ?? WDIFF [ <strong>RHEL/CENTOS/FEDORA</strong> ? <strong>ROCKY/ALMALINUX</strong> ??]
$ Sudo Emerge -A Sys -Apps/Wdiff [on <strong>gentoo linux</strong> ]
$ sudo apk add wdiff [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S Wdiff [ <strong>Arch Linux</strong> ]
$ Sudo Zypper ?? WDIFF [ <strong>OpenSuse</strong> ]    

? ??? ??? ????? ?? ?? ??? ?? ?????.

 $ wdiff file1.txt file2.txt

Linux?? ???? ??? Wdiff Manual? ??????.

 # Man Wdiff

2. vimdiff ??

Vimdiff? Diff ????? ???? ?? ???? ????? ???? ??? ?? ??? ?? 4 ?? ??? ??? ?? ? ? ????. ???? Vimdiff? VIM ??? ???? ???? 2 ~ 3 ? ?? 4 ?? ??? ?? ?.

Vimdiff? ????? ???? VIM? ??????? ???? ?? ?? ??? ???? ???? ??? ? ????.

 $ sudo apt install vim [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ Sudo Yum ?? VIM [ <strong>Rhel/Centos/Fedora</strong> ? <strong>Rocky/Almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/vim [On <strong>Gentoo Linux</strong> ]
$ sudo apk add vim [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S VIM [ <strong>Arch Linux</strong> ??]
$ sudo zypper install vim [ <strong>OpenSuse</strong> ]    

Vimdiff? ???? ? ??? ????? ?? ??? ?????.

 $ vimdiff file1.txt file2.txt

Vimdiff? ???? ? ??? ??? ?? ????.

 $ vimdiff file1.txt file2.txt file3.txt

??? ?? ? ?? ??? ??? ???? ?? ???? ??? ? ? ????.

 $ man vimdiff

3. Sdiff

SDIFF ??? ? ??? ???? ???? ? ??? ??? ???? ? ?????. ? ??? ??? ??? ?? ???? ">" ? ?? ???? ???? " ? ?? ???? ???? ????? ?? ?? ?????.

SDIFF ??? ????? ???? Linux ???? ?? ??? ?? ?????. ??? ???? ?? ?? ??? ???? ???? ??? ? ????.

 $ sudo apt ?? Diffutils [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ Sudo Yum Diffutils [ <strong>Rhel/Centos/Fedora</strong> ? <strong>Rocky/Almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/Diffutils [ <strong>Gentoo Linux</strong> ??]
$ sudo apk ?? Diffutils [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S Diffutils [ <strong>Arch Linux</strong> ]
$ sudo zypper ?? Diffutils [ <strong>OpenSuse</strong> ]    

? ??? ???? ???? ??? ?????.

 $ sdiff file1.txt file2.txt

?? DIFF ??? ??? ? Linux?? ??? ??? ?? GUI DIFF ??? ??? ?????.

4. Kompare

Kompare? ???? ?? ?? ??? ?????? ?? ? ??? ??? ?? ? ?? ?????.

Linux ???? Kompare? ????? ???? ?? ??? ???? ??? ? ????.

 $ sudo apt install kompare [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ sudo yum kompare [ <strong>rhel/centos/fedora</strong> ? <strong>rocky/almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/Kompare [ <strong>Gentoo Linux</strong> ??]
$ sudo apk add kompare [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S Kompare [ <strong>Arch Linux</strong> ??]
$ sudo zypper install kompare [ <strong>OpenSuse</strong> ]    

? ?? ? ??? ??? ????.

• ?? ?? ??? ?????
• ???? ??? ?????
• Diff ?? ??? ?????
• ??? ?? ??? ?????
• ?? ??? ??? ???? ?????

5. ??

Diffmerge? ??? ???? ?????? ??? ??? GUI ?? ???????. ? ??? ??? ???? Diff ?? ? Diff ?? ? ? ?? ?? ??? ???, ?? ? ?? ? ??? ?????. 3 ?? ?? ??? ??? ??? ???? ?? ??? ????.

??? ?? ??? ????.

• ???? ??? ?????
• ?? ???? ??
• ?? ?? ?????

6. MELD - DIFF ??

Meld ? ??? GUI DIFF ? MERGE ???, ???? ??, ???? ? ?? ?? ????? ??? ? ????. ???? ?? ??? ?? ? ??? ?? ??? ?????.

• ??? ????? ??? ? 3 ?? ??
• ???? ? ?? ??? ???? ?? ?? ????
• ?? ?? ??? ??? ????? ??? ???? ??? ? ?? ????.
• ???? ??? ?? ??
• Git, Mercurial, Subversion, Bazaar? ? ?? ?? ?????

Linux? Meld? ??????? ??? ???? ???? ?? ??????? ??? ? ????.

 $ sudo apt install meld [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ Sudo Yum ?? Meld [ <strong>Rhel/Centos/Fedora</strong> ? <strong>Rocky/Almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/Meld [On <strong>Gentoo Linux</strong> ]
$ sudo apk ?? meld [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S Meld [ <strong>Arch Linux</strong> ]
$ sudo zypper ?? meld [ <strong>OpenSuse</strong> ]    

7. ?? - GUI DIFF ??

Diffuse? ?? ?? ??, ?? ??? GUI DIFF ? Linux?? ??? ??? ?? ?????. Python?? ??? ?? ? ?? ?? ??, ? ?? ?? ? ???? ??, ?? ?? ? ?? ?? ? ?? ?? ??? ?????.

Linux? ??? ????? ????? ??? ???? ??? ? ????.

 $ sudo apt ?? ?? [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ Sudo Yum ?? ?? [ <strong>Rhel/Centos/Fedora</strong> ? <strong>Rocky/Almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/Diffuse [on <strong>gentoo linux</strong> ]
$ sudo apk ?? ?? [ <strong>Alpine Linux</strong> ??]
$ Sudo Pacman -S ?? [ <strong>Arch Linux</strong> ??]
$ sudo zypper ?? ?? [ <strong>OpenSuse</strong> ]    

?? ??, ??? ???? ???? ???? ??? ?? ???? ??? ??? ?? ??? ???? ?? ??? ?? ? ? ????.

?? ??? ??? ????.

• ?? ?? ??
• ?? ????? ??? ?? ??
• ??? ?? ??? ?????
• ?? ?? ??
• GIT, CVS, DARCS, MERCURIAL, RCS, SUBVERSION, SVK ? MONOTONE? ?????.

8. xxdiff - Diff ? ?? ??

XXDIFF? Linux, Solaris, HP/UX, IRIX ? DEC TRU64? ?? UNIX? ?? ?? ???? ???? ?? ?? ? ???? ??? ? ?? ?????. XXDIFF? ? ?? ??? ?? ?? ??? ?? ?? ??? DIFF ??? ??? ?????.

??? ?? ?? ??? ????.

• 2, 3 ?? ?? 2 ?? ????? ?? ?? ??
• ?? ?? ??
• ??? ??? ?? ? ?? ?? ??
• ?? ??/??? ?????
• GNU Diff, Sig Diff, ClearedDiff ?? ?? ?? DIFF ??? ?????.
• ????? ???? ?? ?????
• ??? ??? ?? ?? ??? ??? ???? ??? ??? ?? ? ? ????.

9. KDIFF3 - - DIFF ? ?? ??

KDIFF3 ? KDEVENVENT ?? ?? ? ?? ???? ??? ??? DIFF ? ?? ??? Linux ? Mac OS X, Windows? ??? ?? Unix? ?? ????? ?????.

Linux? KDIFF3? ????? ????? ??? ???? ??? ? ????.

 $ sudo apt kdiff3 [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ sudo yum kdiff3 [ <strong>rhel/centos/fedora</strong> and <strong>rocky/almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/Kdiff3 [ <strong>Gentoo Linux</strong> ??]
$ sudo apk add kdiff3 [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S Kdiff3 [ <strong>Arch Linux</strong> ]
$ sudo zypper install kdiff3 [on <strong>opensuse</strong> ]    

2 ~ 3 ?? ?? ?? ????? ????? ?? ? ? ??? ??? ?? ????? ??? ????.

• ??? ? ???, ???? ?????
• Auto-Merge? ?????
• Merge-Conflicts? ????? ?? ???
• ?? ??, UTF-8 ? ?? ?? ??? ?????
• ??? ?? ? ? ????
• Windows ??? ?? ??
• ?? ???-?? ?? "Bom"? ?? ?? ??? ?????.
• ?? ?? ??? ?????
• ??? ? GUI ? ? ??

10. Tkdiff

TKDIFF ? ?? ? ?? ??? ???? ??? ? ??? UNIX DIFF ????? ??? ???, ???? ?? GUI ?????. Linux, Windows ? Mac OS X?? ??? ? ????.

?? Diff ???, ?? ?? ????? ??? ??? ? ? ? ?? ?? ???? ??? ????.

Linux? tkdiff? ????? ???? ??? ???? ??? ? ????.

 $ sudo apt ?? tkdiff [ <strong>Debian, Ubuntu ? Mint</strong> ??]
$ Sudo Yum ?? tkdiff [ <strong>Rhel/Centos/Fedora</strong> ? <strong>Rocky/Almalinux</strong> ??]
$ Sudo Emerge -A Sys -Apps/Tkdiff [ <strong>Gentoo Linux</strong> ??]
$ sudo apk ?? tkdiff [ <strong>Alpine Linux</strong> ]
$ Sudo Pacman -S Tkdiff [ <strong>Arch Linux</strong> ]
$ sudo zypper ?? tkdiff [ <strong>OpenSuse</strong> ]    

??

??? ?? ? ???? ??? ? ?? ?? ? ??? ??? ??? ?? ??? ? ? ??? ??? ? ? ????.

Linux?? ?? ??? ??? Diff ??? ???? ??? ?? ? ??? ???? ??? ??? ???, ??? ? ?? Diff ??? ???? ??? ?? ??? ??? ??? ?? ????.

? ??? Linux?? 10 ?? ??? ?? ?? ? ???? (DIFF) ??? ?? ?????. ??? ??? PHP ??? ????? ?? ?? ??? ?????!