User Tools

Site Tools


утилиты_diff_и_patch

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
утилиты_diff_и_patch [2011/02/25 12:31]
val
утилиты_diff_и_patch [2016/04/07 09:25] (current)
val [Утилиты diff и patch]
Line 1: Line 1:
 ====== Утилиты diff и patch ====== ====== Утилиты diff и patch ======
 +
 +  * [[https://​youtu.be/​vqPaHyisBB0|Видео:​ Утилиты diff и patch]]
 +  * [[http://​ru.wikipedia.org/​wiki/​Patch_(UNIX)|patch (UNIX)]]
  
 ===== Сравнение каталогов ===== ===== Сравнение каталогов =====
  
 <​code>​ <​code>​
-$ diff каталог1 каталог2+$ diff /usr/share /​usr/​local/​share
 </​code>​ </​code>​
 +
 ===== Сравнение двоичных файлов ===== ===== Сравнение двоичных файлов =====
 <​code>​ <​code>​
-$ diff /bin/ls /usr/bin/lsvfs +$ diff /usr/bin/test /usr/bin/
 + ​или 
 +$ diff /bin/test /bin/[
  
-diff /bin/ls /usr/bin/lscpu +ls -i /usr/bin/test /usr/bin/[ 
- + или 
-Binary files /bin/ls and /usr/bin/ls... differ+$ ls -i /bin/test /bin/[
 </​code>​ </​code>​
 +
 ===== Сравнение текстовых файлов ===== ===== Сравнение текстовых файлов =====
 <​code>​ <​code>​
утилиты_diff_и_patch.1298626304.txt.gz · Last modified: 2013/05/22 13:50 (external edit)