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

diff --git a/sa_x_base b/sa_x_base
index 5b4e6d01f71e8b5ce961530156992c17da26ce27..8089e5c3e703cbcdf00ad40834f208acf9c63bef 100644 (file)
--- a/sa_x_base
+++ b/sa_x_base
@@ -1 +1 @@
-~/.home_modules/x_base ~/bin/svnmerge ~/.home_modules/x_base ~/
\ No newline at end of file
+~/.home_modules/x_base ~/bin/svnmerge . ~/ ~/.home_modules/x_base
\ No newline at end of file