vim -d file01 file02 diff file01 file02 对比两文件的不同

[root@86 vhosts]# vim -d defaul.conf.bak zabbix.xinxianm.com.conf 

 

server {                                            |  server {
          listen       80;                            |          listen       80;
          server_name  localhost;                     |          server_name  localhost zabbix.xinxianm.com; 
          index index.html index.htm index.php;       |          index index.html index.htm index.php;
          root /alidata/www/default;                  |          root /usr/html/zabbix;                      
          location ~ .*\.(php|php5)?$                 |          location ~ .*\.(php|php5)                   
          {                                           |          {
                  #fastcgi_pass  unix:/tmp/php-cgi.soc|                  #fastcgi_pass  unix:/tmp/php-cgi.soc
                  fastcgi_pass  127.0.0.1:9000;       |                  fastcgi_pass  127.0.0.1:9000;
                  fastcgi_index index.php;            |                  fastcgi_index index.php;
                  include fastcgi.conf;               |                  include fastcgi.conf;
  ----------------------------------------------------|                  fastcgi_param PATH_INFO $fastcgi_scr
          }                                           |          }
          location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$  |          location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$
          {                                           |          {
                  expires 30d;                        |                  expires 30d;
          }                                           |          }
          location ~ .*\.(js|css)?$                   |          location ~ .*\.(js|css)?$
          {                                           |          {
                  expires 1h;                         |                  expires 1h;
          }                                           |          }
          #α¾²Ì¬¹æÔò                                 |  ----------------------------------------------------
          include /etc/nginx/rewrite/default.conf;    |          include /etc/nginx/rewrite/default.conf;
          access_log  /var/log/nginx/default.log;     |          access_log  /var/log/nginx/zabbix.log;      
  }                                                   |  }
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
defaul.conf.bak                     1,1            All zabbix.xinxianm.com.conf            1,1            All
"zabbix.xinxianm.com.conf" 24L, 550C