linux Îļþ¶Ô±È¹¤¾ß£¬linuxÎļþ±È¶Ô
chanong
|´ó¼ÒºÃ£¬ÎÒ½ÐÐãÁ¼¡£
ÔÚ±àд´úÂëʱ£¬Äú¾³£ÐèÒªÖªµÀÁ½¸öÎļþÖ®¼ä»òͬһÎļþµÄ²»Í¬°æ±¾Ö®¼äµÄ²îÒì¡£ WindowsÓÐÒ»¸ö·Ç³£Ç¿´óµÄ¹¤¾ß£¬½Ð×öBeyondCompare£¬µ«ÊÇÔÚLinuxÉÏÄãÓ¦¸ÃʹÓÃʲôÑùµÄ¹¤¾ßÄØ£¿
±¾ÎĽéÉÜÁËLinuxϾÅÖÖ³£ÓõĴúÂë±È½Ï¹¤¾ß£¬³ýÁËÃüÁîÐй¤¾ßÖ®Í⣬»¹ÓÐGUI½çÃæ¹¤¾ß¿ÉÒÔÈôúÂë±È½Ï±äµÃ¼òµ¥¡£
1. diffÃüÁîdiffÃüÁîÊÇLinux×Ô´øµÄÒ»¸ö¹¦ÄÜÇ¿´óµÄÎı¾±È½Ï¹¤¾ß£¬·Ç³£ÓÐÓá£ÎÒ֮ǰд¹ýһƪµ¥¶ÀµÄÎÄÕ½éÉÜÈçºÎʹÓÃËü£¬ËùÒÔÇëµã»÷ÏÂÃæµÄÁ´½ÓÔĶÁ¡£
Á˽âÔÚLinux ÉϱȽÏÎı¾µÄ¼¼ÇÉ
diff ÃüÁîԤװÔÚ´ó¶àÊýLinux ·¢ÐаæÉÏ£¬ÔÊÐíÄúÖðÐбȽÏÁ½¸öÎı¾Îļþ²¢´òÓ¡³ö²îÒì¡£ÇëÖ±½Ó²ÎÔÄÊÖ²áÒÔ»ñÈ¡¸ü¶àÐÅÏ¢¡£
$ man diff È»¶ø£¬ËäÈ»diff ÃüÁÄÜÇ¿´ó£¬µ«ËüµÄÊä³ö¿ÉÄܹýÓÚÁîÈËÓ¡ÏóÉî¿Ì¡¢²»Ö±¹ÛÇÒÁîÈËÀ§»ó¡£Òò´Ë£¬ÎªÁËÃÖ²¹Õâ¸öȱµã£¬Ò»Ð©ÁìÏȵĹ«Ë¾»ùÓÚdiff ¿ª·¢Á˸üÇ¿´óµÄ¹¤¾ß¡£ÕâÀïÍÆ¼öµÄÁ½¸öÊÇcolordiffºÍwdiff¡£
colordiff ÃüÁîcolordiff ÊÇÒ»¸öPerl ½Å±¾¹¤¾ß£¬ËüÉú³ÉÓëdiff ÃüÁîÏàͬµÄÊä³ö£¬µ«¾ßÓвÊÉ«´úÂëºÍÓ﷨ͻ³öÏÔʾ¡£Í¬Ê±£¬Èç¹ûÄú²»Ï²»¶Ä¬ÈÏÑÕÉ«£¬Äú¿ÉÒÔ×Ô¶¨ÒåÖ÷Ìâ¡£
Äú¿ÉÒÔͨ¹ýÕë¶Ô²»Í¬·¢ÐаæÑ¡Ôñ²»Í¬µÄ°²×°ÃüÁ×ÔÐÐÔÚ¼ÆËã»úÉ**²×°colordiff¡£
$ yum install colordiff [¶ÔÓÚCentOS/RHEL/Fedora] $ dnf install colordiff [¶ÔÓÚFedora 23 ¼°¸ü¸ß°æ±¾] $ sudo apt-get install colordiff [¶ÔÓÚDebian/Ubuntu/Mint] ͬÑù£¬Ê¹ÓÃman ÃüÁî. ÏÔʾ°ïÖú¡£Îĵµ£º
$ man colordiff wdiff ÃüÁîdiff ÃüÁîÖðÐбȽϲîÒ죬µ«wdiff ¸ü¸´ÔÓ£¬²¢ÇÒÖð×ֱȽϡ£Òò´Ë£¬Èç¹ûÎı¾½ö¸ü¸Ä¼¸¸öµ¥´Ê£¬ÄÇôʹÓÃwdiff ÃüÁî»á¸üÓÐЧ¡£
°²×°ÃüÁîÈçÏ¡£
$ yum install wdiff [ÊÊÓÃÓÚCentOS/RHEL/Fedora] $ dnf install wdiff [ÊÊÓÃÓÚFedora 23 ¼°¸ü¸ß°æ±¾] $ sudo apt-get install wdiff [ÊÊÓÃÓÚDebian/Ubuntu/Mint] ¸ü¶àÐÅÏ¢£¬Çë²ÎÔÄÊֲᡣ
$ man wdiff2.vimdiff vimdiff ÃüÁîÏ൱ÓÚVim ±à¼Æ÷diff ģʽÖеÄvim -d ÃüÁî¡£
ͨ³££¬Èç¹ûÔÚ´ËÃüÁîºóÖ¸¶¨¶à¸öÎļþÃû×÷Ϊ²ÎÊý£¬ÕâЩÎļþ½«ÔÚVim ±à¼Æ÷µÄ²ð·Ö´°¿ÚÖÐͬʱ´ò¿ª£¬Í»³öÏÔʾÎļþÄÚÄÚÈݵIJ»Í¬²¿·Ö¡£
ÖÐÎÄÖ÷ҳΪ£ºhttp://vimcdoc.sourceforge.net/doc/diff.html
ÉÏÃæÌáµ½µÄÁ½¸öÊÇLinuxÃüÁîÐбȽϹ¤¾ß£¬µ«ÎÒÃÇÀ´¿´¿´Ò»Ð©GUI±È½Ï¹¤¾ß¡£
3.KompareKompareÊÇÒ»¸ö»ùÓÚdiffµÄGUI¹¤¾ß£¬¿ÉÒÔÈÃÓû§ÇáËɲ鿴ÎļþÖ®¼äµÄ²îÒ죬²¢Ö§³ÖºÏ²¢ÕâЩ²îÒì¡£
KompareµÄÌØµãÈçÏ¡£
Ö§³Ö¶àÖÖdelta¸ñʽ£¬Ö§³ÖĿ¼¼ä±È½Ï£¬Ö§³Ö¶ÁÈ¡deltaÎļþ£¬½çÃæ¶¨ÖÆ£¬Ô´Îļþ²¹¶¡ÎļþµÄ´´½¨ºÍÓ¦Ó᣸ù¤¾ßµÄÖ÷Ò³ÊÇ£ºhttps://www.kde.org/applications/development/kompare/
4. DiffMergeDiffMergeÊÇÒ»¸ö¿çƽ̨µÄGUIÎı¾±È½Ï¹¤¾ß£¬ÓµÓÐÈý¸öƽ̨°æ±¾£ºLinux¡¢WindowsºÍmacOS¡£ÎÒÃÇÖªµÀBeyondCompareÊǸ¶·ÑÈí¼þ£¬ËùÒÔÈç¹ûÄúµÄ¹«Ë¾¶Ô°æÈ¨ÒªÇó±È½Ï¸ß£¬Äú¿ÉÄÜÐèÒª¿¼ÂÇDiffMerge¹¤¾ß¡£
DiffMerge ÓÐÁ½¸öÖ÷Òª¹¦ÄÜ¡£ 1. ÒÔͼÐη½Ê½²é¿´Á½¸öÎļþÖ®¼äµÄ¸ü¸Ä¡£°üÀ¨ÄÚ²¿ÐÐÍ»³öÏÔʾºÍÍêÕûµÄ±à¼Ö§³Ö¡£ 2.ÒÔͼÐη½Ê½ÏÔʾÈý¸öÎļþÖ®¼äµÄ±ä»¯¡£ÔÊÐí×Ô¶¯ºÏ²¢£¨ÔÚ°²È«µÄÇé¿öÏ£©²¢¶Ô½á¹ûÎļþ½øÐÐÍêÈ«±à¼¿ØÖÆ¡£
Ëü¾ßÓÐÒÔÏÂÌØµã£º
Îļþ¼Ð±È½ÏÖ§³Ö£¬¼¯³ÉÎļþä¯ÀÀÆ÷£¬¸ß¶È¿ÉÅäÖ᣸ù¤¾ßµÄÖ÷Ò³ÊÇhttps://sourcegear.com/diffmerge/¡£
5¡¢MeldMeldÊÇÒ»¸öÇáÁ¿¼¶µÄGUI´úÂë±È½Ï¹¤¾ß£¬Ö§³ÖÓû§±È½ÏÎļþºÍĿ¼£¬²¢Óë°æ±¾¿ØÖÆÈí¼þ¸ß¶È¼¯³É¡£È»¶ø£¬¶ÔÓÚÈí¼þ¿ª·¢ÈËÔ±À´Ëµ£¬ÒÔϹ¦ÄÜÌØ±ðÓÐÎüÒýÁ¦£º
Ö´ÐÐË«ÏòºÍÈýÏò²îÒìºÍºÏ²¢ÔÚ²îÒìºÍ³åͻ֮¼äÇáËɵ¼º½°´Îļþ±È½ÏÁ½¸ö»òÈý¸öĿ¼²¢Ê¶±ðеġ¢¶ªÊ§µÄºÍ¸ü¸ÄµÄÎļþÖ§³ÖÐí¶à°æ±¾¿ØÖÆÏµÍ³£¬°üÀ¨Git¡¢Mercurial¡¢Bazaar¡¢SVN µÈ¡£¹Ù·½ÍøÕ¾£ºhttp://meldmerge.org/
6. DiffuseDiffuse ÊÇÁíÒ»¸ö·Ç³£Á÷Ðеġ¢Ãâ·ÑµÄ¡¢½ô´ÕµÄ¡¢·Ç³£¼òµ¥µÄGUI Îı¾²îÒì±È½ÏºÍºÏ²¢¹¤¾ß¡£ËüÊÇÓÃPython±àдµÄ£¬ÓÐÁ½¸öÖ÷Òª¹¦ÄÜ£ºÎļþ±È½ÏºÍ°æ±¾¿ØÖÆ£¬²¢ÔÊÐí±à¼¡¢ºÏ²¢ºÍ±È½ÏÎļþ¡£Á½¸öÎļþÖ®¼ä¡£
Äú¿ÉÒÔʹÓÃËüÀ´²é¿´Îı¾±È½ÏµÄ¸ÅÊö£¬²¢Ê¹ÓÃÊó±êÑ¡ÔñºÍ±à¼ÎļþÖеÄÐС£ÆäËû¹¦ÄܰüÀ¨£º
Ó﷨ͻ³öÏÔʾ¿ì½Ý¼ü£¬·½±ãÎı¾µ¼º½ÎÞÏÞÖÆ³·ÏûÖ§³ÖUnicode ±àÂëÎļþÖ§³ÖÐí¶à°æ±¾¿ØÖÆÏµÍ³£¬°üÀ¨Git¡¢Mercurial¡¢Bazaar ºÍSVN¡£¹Ù·½ÍøÕ¾ÊÇ£ºhttp://diffuse.sourceforge.net/
7. XXdiffXXdiff ÊÇÒ»¸öÃâ·Ñ¡¢Ç¿´óµÄÎļþºÍÎļþ¼Ð²îÒì±È½ÏºÍºÏ²¢¹¤¾ß£¬¿ÉÒÔÔÚÐí¶àÀàUnix ϵͳÉÏÔËÐС£µ«ÆäÏÞÖÆÊÇËü²»Ö§³ÖUnicodeÎļþ£¬²¢ÇÒÎÞ·¨Ö±½Ó±à¼Îļþ¡£
Ëü¾ßÓÐÒÔÏÂÌØµã£º
µÝ¹é±È½ÏÎļþºÍÎļþ¼Ð¡¢Í»³öÏÔʾºÍºÏ²¢²îÒìÒÔ¼°µ¼³ö½á¹ûÒÔÖ§³ÖÍⲿ±È½Ï¹¤¾ß£¬ÀýÈçGNU diff¡¢SIG diff ºÍCleareddiff¡£ÆäËû¹¤¾ßÖ§³Ö½Å±¾À©Õ¹¡£ 8. KDiff3 KDiff3 ÊÇÁíÒ»¸ö·Ç³£Ç¿´óµÄ¿çƽ̨²îÒì¡£ËüÊÇKDevelop ¿ª·¢µÄ±È½ÏºÍºÏ²¢¹¤¾ß£¬¿ÉÒÔÔËÐÐÔÚËùÓÐÀàUnix ƽ̨ÉÏ£¬°üÀ¨Linux¡¢Mac OS¡¢Windows µÈ¡£
Äú¿ÉÒԱȽϻòºÏ²¢2µ½3¸öÎļþ»òĿ¼£¬²¢¾ßÓÐÒÔϹ¦ÄÜ£º
¿ÉÖð¾ä¡¢Öð×ֱȽϲîÒìÖ§³ÖÄÚÖÃ±à¼Æ÷×Ô¶¯ºÏ²¢£¬ÊÖ¶¯½â¾ö³åͻ֧³ÖUnicode¡¢UTF-8µÈ¶àÖÖ±àÂë¸ñʽ֧³Ö´òÓ¡²îÒì¹ÙÍø£ºhttp://kdiff3.sourceforge.net/
9. TkDiff TkDiff ÊÇÒ»¸ö¿çƽ̨¡¢Ò×ÓÚʹÓõÄGUI Îı¾±È½Ï¹¤¾ß£¬¿ÉÒÔÔÚLinux¡¢Windows ºÍMacOS ϵͳÉÏÔËÐС£Ëü»¹ÌṩÁË×óÓÒ½çÃæÀ´²é¿´Á½¸ö±È½ÏµÄÎļþ¡£
²»¹ý£¬Ëü»¹¾ßÓÐÆäËûÎı¾±È½Ï¹¤¾ßËùûÓеÄһЩ¹¦ÄÜ£¬ÀýÈç²îÒìÊéÇ©ºÍµ¼º½Í¼£¬¿ÉÒÔÇáËÉ¿ìËÙ²éÕҺ͵¼º½²îÒì¡£
¹Ù·½ÍøÕ¾ÊÇ£ºhttps://sourceforge.net/projects/tkdiff/








