summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Neukirchen <chneukirchen@gmail.com>2015-05-26 14:02:16 +0200
committerChristian Neukirchen <chneukirchen@gmail.com>2015-05-26 14:02:16 +0200
commit736df08ff993171a2c1b0f7f49d653c4af249e85 (patch)
treeecdcf87e3e2c00e4754796dec0b5abd776cfb3c9
parentcbf5cc8f2a80c95c67766f7a0884744283e54fd9 (diff)
downloadxtools-736df08ff993171a2c1b0f7f49d653c4af249e85.tar.gz
xtools-736df08ff993171a2c1b0f7f49d653c4af249e85.tar.xz
xtools-736df08ff993171a2c1b0f7f49d653c4af249e85.zip
xdiff: better description.
-rw-r--r--README2
-rwxr-xr-xxdiff2
2 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index d2ec7a1..3753a2a 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ https://github.com/voidlinux/xbps
   xbump PKGNAME [git commit options] - git commit a version bump
   xcheckrestart [-v] - list programs using outdated libraries
   xclash - detect file conflicts between XBPS packages
-  xdiff [-u] [DIR] - merge XBPS .new-* files
+  xdiff [-u|-l] [DIR] - merge/diff/list XBPS .new-* files
   xdistdir - figure out XBPS_DISTDIR
   xdowngrade PKGS.xbps... - install XBPS package directly from .xbps file
   xgensum [-i] TEMPLATE - update SHA256 sums in templates
diff --git a/xdiff b/xdiff
index bb72fb9..a5dc9f4 100755
--- a/xdiff
+++ b/xdiff
@@ -1,5 +1,5 @@
 #!/bin/sh
-# xdiff [-u|-l] [DIR] - merge XBPS .new-* files
+# xdiff [-u|-l] [DIR] - merge/diff/list XBPS .new-* files
 
 mergeutil() {
 	vimdiff "$1" "$2" && rm -vi "$1"