diff

$ cat ejemplo1.txt

John Smith 	1001 	Sr. Engineer
Peter		1002	Engineer
Fernandous	1003	Sr. Engineer
Kraml		1004	Jr. Engineer

$ cat ejemplo2.txt

John Smith 	1001 	Sr. Engineer
Peter		1002	Engineer
Fernandous	1003	Resigned
Kraml		1004	Jr. Engineer
Raj		1005	Engineer
  • diff
  • colordiff
  • wdiff
  • dwdiff
  • meld

patch

$ diff -u ejemplo1.txt ejemplo2.txt > ejemplo.patch
$ patch < ejemplo.patch 
$ diff -u ejemplo1.txt ejemplo2.txt
$ patch -R < ejemplo.patch
$ diff -u ejemplo1.txt ejemplo2.txt
 
documentos/diff_y_patch.txt · Última modificación: 2011/08/02 05:11 (editor externo)
Recent changes RSS feed Donate Powered by PHP Valid XHTML 1.0 Valid CSS Driven by DokuWiki