Merge branch 'master' of https://apu.dw.local/git/Users/JoshHoltrop/files

Conflicts: jsvn
2011-06-09 16:27:01 -04:00 · 2011-06-09 16:27:01 -04:00 · bd19fed2dd
commit bd19fed2dd
parent d393d48204 7b7bedb9e9
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -370,13 +370,13 @@ def main(argv):
        if argv[0] == "binaries":
            return binaries(argv, realsvn)

+        if argv[0] == "lockable":
+            return lockable(argv, realsvn)
+
        if argv[0] in ('st', 'status', 'log', 'up', 'update') \
            and colorsvn != '':
            realsvn = colorsvn

-        if argv[0] == "lockable":
-            return lockable(argv, realsvn)
-

    Popen([realsvn] + argv).wait()
    return 0