add . to match everything, and move the arguments to svnmerge around so they're right.

diff --git a/sa_base b/sa_base
index c4cccb2a97c297945c062c8ae4c54cc7b6cc0f7a..95befcbdf1de8f572b7cfa2fd429a1a75d3f69bf 100644 (file)
--- a/sa_base
+++ b/sa_base
@@ -1 +1 @@
-~/.home_modules/base ~/bin/svnmerge ~/.home_modules/base ~/
\ No newline at end of file
+~/.home_modules/base ~/bin/svnmerge . ~/ ~/.home_modules/base
\ No newline at end of file