From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 17 Feb 2006 09:40:32 +0000 (+0000)
Subject: add . to match everything, and move the arguments to svnmerge around so they're right.
X-Git-Url: https://git.donarmstrong.com/?p=emacs.git;a=commitdiff_plain;h=380afd8dff91f1c8772762461eeabd14ea7a4945

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

diff --git a/sa_emacs b/sa_emacs
index fa3e00f..8acec13 100644
--- a/sa_emacs
+++ b/sa_emacs
@@ -1 +1 @@
-~/.home_modules/emacs ~/bin/svnmerge ~/.home_modules/emacs ~/
\ No newline at end of file
+~/.home_modules/emacs ~/bin/svnmerge . ~/ ~/.home_modules/emacs
\ No newline at end of file