summaryrefslogtreecommitdiff
path: root/devel/diffutils/DESCR
diff options
context:
space:
mode:
authorzuntum <zuntum@pkgsrc.org>2001-11-01 00:57:41 +0000
committerzuntum <zuntum@pkgsrc.org>2001-11-01 00:57:41 +0000
commitc72c1cf5f95cbe537b005028f1743cddb16ef203 (patch)
tree93b6296152ccfbaa88b43de043b2d69ce6e63fc5 /devel/diffutils/DESCR
parent37637e483f1bf6574e9306aebbd013bb63d888d6 (diff)
downloadpkgsrc-c72c1cf5f95cbe537b005028f1743cddb16ef203.tar.gz
Move pkg/ files into package's toplevel directory
Diffstat (limited to 'devel/diffutils/DESCR')
-rw-r--r--devel/diffutils/DESCR21
1 files changed, 21 insertions, 0 deletions
diff --git a/devel/diffutils/DESCR b/devel/diffutils/DESCR
new file mode 100644
index 00000000000..d435b7352ae
--- /dev/null
+++ b/devel/diffutils/DESCR
@@ -0,0 +1,21 @@
+GNU diff utilities:
+
+ You can use the `diff' command to show differences between two
+files, or each corresponding file in two directories. `diff' outputs
+differences between files line by line in any of several formats,
+selectable by command line options. This set of differences is often
+called a "diff" or "patch". For files that are identical, `diff'
+normally produces no output; for binary (non-text) files, `diff'
+normally reports only that they are different.
+
+ You can use the `cmp' command to show the offsets and line numbers
+where two files differ. `cmp' can also show all the characters that
+differ between the two files, side by side.
+
+ You can use the `diff3' command to show differences among three
+files. When two people have made independent changes to a common
+original, `diff3' can report the differences between the original and
+the two changed versions, and can produce a merged file that contains
+both persons' changes together with warnings about conflicts.
+
+ You can use the `sdiff' command to merge two files interactively.