テキスト比較

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

/etc/pacman.conf

Created 2 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

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

110 lines

Lines
Total
Added

Words
Total
Added

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

131 lines

# /etc/pacman.conf

# See the pacman.conf(5) manpage for option and repository directives

# GENERAL OPTIONS

[options]

# The following paths are commented out with their default values listed.

# If you wish to use different paths, uncomment and update the paths.

#RootDir = /

#DBPath = /var/lib/pacman/

#CacheDir = /var/cache/pacman/pkg/

#LogFile = /var/log/pacman.log

#GPGDir = /etc/pacman.d/gnupg/

#HookDir = /etc/pacman.d/hooks/

HoldPkg = pacman glibc

#XferCommand = /usr/bin/curl -L -C - -f -o %o %u

#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u

#CleanMethod = KeepInstalled

#UseDelta = 0.7

Architecture = auto

Architecture = x86_64 x86_64_v3

#IgnorePkg =

# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

#IgnorePkg =

#IgnoreGroup =

#NoUpgrade =

#NoExtract =

# Misc options

#UseSyslog

Color

ILoveCandy

#NoProgressBar

#CheckSpace

VerbosePkgLists

DisableDownloadTimeout

ParallelDownloads = 10

# By default, pacman accepts packages signed by keys that its local keyring

# trusts (see pacman-key and its man page), as well as unsigned packages.

SigLevel = Required DatabaseOptional

LocalFileSigLevel = Optional

#RemoteFileSigLevel = Required

# NOTE: You must run `pacman-key --init` before first using pacman; the local

# keyring can then be populated with the keys of all official Arch Linux

# packagers with `pacman-key --populate archlinux`.

# REPOSITORIES

# - can be defined here or included from another file

# - pacman will search repositories in the order defined here

# - local/custom mirrors can be added here or in separate files

# - repositories listed first will take precedence when packages

# have identical names, regardless of version number

# - URLs will have $repo replaced by the name of the current repo

# - URLs will have $arch replaced by the name of the architecture

# Repository entries are of the format:

# [repo-name]

# Server = ServerName

# Include = IncludePath

# The header [repo-name] is crucial - it must be present and

# uncommented to enable the repo.

# The testing repositories are disabled by default. To enable, uncomment the

# repo name header and Include lines. You can add preferred servers immediately

# after the header, and they will be used before the default mirrors.

#[testing]

# Main (CachyOS)

#[cachyos-testing-v3]

#Include = /etc/pacman.d/mirrorlist

[cachyos-v3]

Include = /etc/pacman.d/cachyos-v3-mirrorlist

[cachyos-core-v3]

Include = /etc/pacman.d/cachyos-v3-mirrorlist

[cachyos-extra-v3]

Include = /etc/pacman.d/cachyos-v3-mirrorlist

[cachyos-community-v3]

Include = /etc/pacman.d/cachyos-v3-mirrorlist

[cachyos]

Include = /etc/pacman.d/cachyos-mirrorlist

# Fallback (Arch Linux)

#[testing]

#Include = /etc/pacman.d/mirrorlist

[core]

Include = /etc/pacman.d/mirrorlist

[extra]

Include = /etc/pacman.d/mirrorlist

#[community-testing]

#Include = /etc/pacman.d/mirrorlist

[community]

Include = /etc/pacman.d/mirrorlist

# If you want to run 32 bit applications on your x86_64 system,

# enable the multilib repositories as required here.

# Wine

#[multilib-testing]

#Include = /etc/pacman.d/mirrorlist

[multilib]

Include = /etc/pacman.d/mirrorlist

# An example of a custom package repository. See the pacman manpage for

# tips on creating your own repositories.

#[custom]

#SigLevel = Optional TrustAll

#Server = file:///home/custompkgs

[options]

#NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/*

#NoExtract = usr/share/gtk-doc/html/* usr/share/doc/*

#NoExtract = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*

#NoExtract = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*

#NoExtract = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*

#NoExtract = !usr/share/*locales/trans*

#NoExtract = !usr/share/X11/locale/C/*

#NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/*

#NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz

NoExtract = usr/share/man/* usr/share/info/*

#NoExtract = usr/share/vim/vim*/lang/*

#NoExtract = etc/pacman.conf etc/pacman.d/mirrorlist

保存された差分

原文

ファイルを開く

#
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives

#
# GENERAL OPTIONS
#
[options]
# The following paths are commented out with their default values listed.
# If you wish to use different paths, uncomment and update the paths.
#RootDir     = /
#DBPath      = /var/lib/pacman/
#CacheDir    = /var/cache/pacman/pkg/
#LogFile     = /var/log/pacman.log
#GPGDir      = /etc/pacman.d/gnupg/
#HookDir     = /etc/pacman.d/hooks/
HoldPkg     = pacman glibc
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
#UseDelta    = 0.7
Architecture = auto

#IgnorePkg   =
#IgnorePkg   =
#IgnoreGroup =

#NoUpgrade   =
#NoExtract   =

# Misc options
#UseSyslog
Color
ILoveCandy
#NoProgressBar
#CheckSpace
VerbosePkgLists
DisableDownloadTimeout
ParallelDownloads = 10

# By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages.
SigLevel    = Required DatabaseOptional
LocalFileSigLevel = Optional
#RemoteFileSigLevel = Required

# NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Arch Linux
# packagers with `pacman-key --populate archlinux`.

#
# REPOSITORIES
#   - can be defined here or included from another file
#   - pacman will search repositories in the order defined here
#   - local/custom mirrors can be added here or in separate files
#   - repositories listed first will take precedence when packages
#     have identical names, regardless of version number
#   - URLs will have $repo replaced by the name of the current repo
#   - URLs will have $arch replaced by the name of the architecture
#
# Repository entries are of the format:
#       [repo-name]
#       Server = ServerName
#       Include = IncludePath
#
# The header [repo-name] is crucial - it must be present and
# uncommented to enable the repo.
#

# The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.

#[testing]
#Include = /etc/pacman.d/mirrorlist

[cachyos-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-community-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist

[core]
Include = /etc/pacman.d/mirrorlist

[extra]
Include = /etc/pacman.d/mirrorlist

#[community-testing]
#Include = /etc/pacman.d/mirrorlist

[community]
Include = /etc/pacman.d/mirrorlist

# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.

#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist

[multilib]
Include = /etc/pacman.d/mirrorlist

# An example of a custom package repository.  See the pacman manpage for
# tips on creating your own repositories.
#[custom]
#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs

変更されたテキスト

ファイルを開く

#
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives

# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
#IgnorePkg   =
#IgnoreGroup =

#NoUpgrade   =
#NoExtract   =

# Misc options
#UseSyslog
Color
ILoveCandy
#NoProgressBar
#CheckSpace
VerbosePkgLists
DisableDownloadTimeout
ParallelDownloads = 10

# Main (CachyOS)

#[cachyos-testing-v3]
#Include = /etc/pacman.d/mirrorlist
[cachyos-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-core-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-extra-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos-community-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist

# Fallback (Arch Linux)

#[testing]
#Include = /etc/pacman.d/mirrorlist
[core]
Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
#[community-testing]
#Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist

# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.

# Wine
#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist
[multilib]
Include = /etc/pacman.d/mirrorlist

# An example of a custom package repository.  See the pacman manpage for
# tips on creating your own repositories.
#[custom]
#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs

[options]
#NoExtract  = usr/share/help/* !usr/share/help/en* !usr/share/help/C/*
#NoExtract  = usr/share/gtk-doc/html/* usr/share/doc/*
#NoExtract  = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
#NoExtract   = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
#NoExtract   = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
#NoExtract   = !usr/share/*locales/trans*
#NoExtract   = !usr/share/X11/locale/C/*
#NoExtract   = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/*
#NoExtract  = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
NoExtract  = usr/share/man/* usr/share/info/*
#NoExtract  = usr/share/vim/vim*/lang/*
#NoExtract  = etc/pacman.conf etc/pacman.d/mirrorlist