projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix merge errors, update man page to include new and changed commands
[debian/tar]
/
cleanup-script.sh
diff --git
a/cleanup-script.sh
b/cleanup-script.sh
index 1fd7d47b90cd3d6bff24d4285dcf9f9af25e2c14..684ac91414a1f273819612c8463876f4d1fde32f 100755
(executable)
--- a/
cleanup-script.sh
+++ b/
cleanup-script.sh
@@
-218,10
+218,7
@@
then ${echo} 'x - removed lock directory `'${lock_dir}\''.'
else ${echo} 'x - failed to remove lock directory `'${lock_dir}\''.'
exit 1
fi
-<<<<<<< HEAD:cleanup-script.sh
-=======
git add doc/Makefile doc/Makefile.in doc/README
->>>>>>> c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6:cleanup-script.sh
exit 0