(tnoodle)Removed line from botched conflict resolution.
Removed exclamation marks.
(tnoodle)Merging in changes from gnehzr. I have no idea if this is going to preserve his commit history.
(git-tools) Added savepid to git-tools.
(git-tools) Added a pretty generic automagicserver.sh script to git-tools that will start up a server in a screen session, and keep it up to date with whatever git repo we're using.
(git-tools) We've gotta kill the whole process tree to kill the server.
Improved paranoia.
Fixed bug with rmtree(foo) where foo isn't a directory.
(tnoodle)Fixed bug with rmtree(foo) where foo isn't a directory.
Added preliminary watermark support. I'd like to style it some more.
(tnoodle)Added preliminary watermark support. I'd like to style it some more.
blah subprocess blah
Merge commit '3522135f694e69c5432a08d5ae0187cb8be7241d'
Merge commit 'cd7b17a1a0bf32bbf2c81d64d0559f0f48083f2e'
(tnoodle)Merge commit 'cd7b17a1a0bf32bbf2c81d64d0559f0f48083f2e'
Now with added paranoia
Actually obeying assertSuccess arg.
bash isn't in the same place everywhere.
(tnoodle)bash isn't in the same place everywhere.
Improved automagic server script to handle multiple subprojects for a
given repo!