テキスト比較

2 つのテキストファイルの違いを見つける

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 10 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

47 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

59 lines

config dnsmasq

option domainneeded '1'

option boguspriv '1'

option filterwin2k '0'

option localise_queries '1'

option rebind_localhost '1'

option local '/lan/'

option domain 'lan'

option expandhosts '1'

option nonegcache '0'

option authoritative '1'

option readethers '1'

option leasefile '/tmp/dhcp.leases'

option resolvfile '/tmp/resolv.conf.auto'

option localservice '1'

option rebind_protection '0'

config dhcp 'lan'

option interface 'lan'

option start '100'

option leasetime '12h'

option dhcpv6 'server'

option ra 'server'

option networkid 'tag:!dhcptv'

option limit '100'

option ra_management '1'

config dhcp 'wan'

option interface 'wan'

option ignore '1'

config odhcpd 'odhcpd'

option maindhcp '0'

option leasefile '/tmp/hosts/odhcpd'

option leasetrigger '/usr/sbin/odhcpd-update'

config vendorclass 'vendortv'

option vendorclass 'IAL'

option networkid 'dhcptv'

config dhcp 'dhcptv'

option networkid 'tag:dhcptv'

option interface 'lan'

option start '200'

option limit '23'

option leasetime '24h'

#Configuracion puesta yo

config dhcp 'tvlan'

option leasetime '12h'

option interface 'tvlan'

option start '100'

option limit '100'

list dhcp_option '6,172.26.23.3'

list dhcp_option '240,:::::239.0.2.10:22222:v6.0:239.0.2.30:22222'

#-------------------------

保存された差分

原文

ファイルを開く

config dnsmasq
	option domainneeded '1'
	option boguspriv '1'
	option filterwin2k '0'
	option localise_queries '1'
	option rebind_localhost '1'
	option local '/lan/'
	option domain 'lan'
	option expandhosts '1'
	option nonegcache '0'
	option authoritative '1'
	option readethers '1'
	option leasefile '/tmp/dhcp.leases'
	option resolvfile '/tmp/resolv.conf.auto'
	option localservice '1'
	option rebind_protection '0'

config dhcp 'lan'
	option interface 'lan'
	option start '100'
	option leasetime '12h'
	option dhcpv6 'server'
	option ra 'server'
	option networkid 'tag:!dhcptv'
	option limit '100'
	option ra_management '1'

config dhcp 'wan'
	option interface 'wan'
	option ignore '1'

config odhcpd 'odhcpd'
	option maindhcp '0'
	option leasefile '/tmp/hosts/odhcpd'
	option leasetrigger '/usr/sbin/odhcpd-update'

config vendorclass 'vendortv'
	option vendorclass 'IAL'
	option networkid 'dhcptv'

config dhcp 'dhcptv'
	option networkid 'tag:dhcptv'
	option interface 'lan'
	option start '200'
	option limit '23'
	option leasetime '24h'

変更されたテキスト

ファイルを開く

config dhcp 'wan'
	option interface 'wan'
	option ignore '1'

config odhcpd 'odhcpd'
	option maindhcp '0'
	option leasefile '/tmp/hosts/odhcpd'
	option leasetrigger '/usr/sbin/odhcpd-update'

config vendorclass 'vendortv'
	option vendorclass 'IAL'
	option networkid 'dhcptv'

config dhcp 'dhcptv'
	option networkid 'tag:dhcptv'
	option interface 'lan'
	option start '200'
	option limit '23'
	option leasetime '24h'
    
    
    
#Configuracion puesta yo
config dhcp 'tvlan'
	option leasetime '12h'
	option interface 'tvlan'
	option start '100'
	option limit '100'
	list dhcp_option '6,172.26.23.3'
	list dhcp_option '240,:::::239.0.2.10:22222:v6.0:239.0.2.30:22222'
#-------------------------