[冒頭] | [目次] | [見出し] | [ ? ] |
This manual is for GNU Diffutils
(version 2.8.1, 5 April 2002),
and documents the GNU diff
, diff3
,
sdiff
, and cmp
commands for showing the
differences between files and the GNU patch
command for
using their output to update files.
Copyright © 1992, 1993, 1994, 1998, 2001, 2002 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
(a) The FSF’s Back-Cover Text is: “You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development.”
概要 | Preliminary information. | |
1. 比較が意味するもの | What file comparison means. | |
2. diff の出力書式 | Formats for two-way difference reports. | |
3. 不完全な行 | Lines that lack trailing newlines. | |
4. ディレクトリの比較 | Comparing files and directories. | |
5. diff の出力をより良くする | Making diff output prettier.
| |
6. diff の性能のトレードオフ | Making diff smarter or faster.
| |
7. 三つのファイルの比較 | Formats for three-way difference reports. | |
8. 共通の先祖からマージ | Merging from a common ancestor. | |
9. sdiff を用いた対話的なマージ | Interactive merging with sdiff .
| |
10. patch を用いてマージする | Using patch to change old files into new ones.
| |
11. パッチの作成と使用の助言 | Tips for making and using patch distributions. | |
12. cmp の呼び出し | Compare two files byte by byte. | |
13. diff の呼び出し | Compare two files line by line. | |
14. diff3 の呼び出し | Compare three files line by line. | |
15. patch の呼び出し | Apply a diff file to an original. | |
16. sdiff の呼び出し | Side-by-side merge of file differences. | |
17. 標準への準拠 | Conformance to the POSIX standard. | |
18. 将来のプロジェクト | If you’ve found a bug or other shortcoming. | |
A. このマニュアルのコピーに付いて | How to make copies of this manual. | |
B. 索引 | Index. |
[冒頭] | [目次] | [見出し] | [ ? ] |
この文書は新堂 安孝によって2009年9月22日にtexi2html 1.82を用いて生成されました。