.travis.yml: Add build dep on libshell-command-perl

[code/vcsh.git] / doc / sample_hooks / pre-merge-unclobber

diff --git a/doc/sample_hooks/pre-merge-unclobber b/doc/sample_hooks/pre-merge-unclobber
index 93a731908f08e8b75a95b1569aea69061a3bec21..52610962e611b9bafde5c3fe5f2f70423ed91c39 100755 (executable)
--- a/doc/sample_hooks/pre-merge-unclobber
+++ b/doc/sample_hooks/pre-merge-unclobber
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-# This code does amost exactly what the native VCSH sanity checking code
-# does except that on finding a potential merge conflict, it moves the 
-# extant object out of the way temporarily. The merge then happens cleanly
-# as far as git knows, and a post-merge hook can figure out what to do with
-# the extant versions of the objects.
+# This code does amost exactly what the native vcsh sanity checking code
+# does except that on finding a potential merge conflict, it moves existing
+# files out of the way temporarily. Merging (part of `vcsh clone`) happens
+# cleanly, and a post-merge hook can be used to figure out what to do with
+# the now-renamed files.
 
 for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
        [ -e "$object" ] && mv "$object" "$object.vcsh-unclobber"