gclient_scm.py: Make working with git more reliable

tests/gclient_scm_test.py

Index: tests/gclient_scm_test.py
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 20a4cbdb08263a0caedb33d8ffdfb7c84c589edd..f3231a4952dd5a5b2f2c782f13befa9b51a7c730 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -696,10 +696,8 @@ from :3
     self.assertRaisesError(exception, scm.update, options, (), [])
     exception = \

[M-A Ruel, 2010/05/28 15:55:50]

Please use () instead.

exception = ('\n...'
             'foo'
             'bar')

above too.

         '\n____ . at refs/heads/master\n' \
-        '\tAlready in a conflict, i.e. (no branch).\n' \
-        '\tFix the conflict and run gclient again.\n' \
-        '\tOr to abort run:\n\t\tgit-rebase --abort\n' \
-        '\tSee man git-rebase for details.\n'
+        '\tYou have unstaged changes.\n' \
+        '\tPlease commit, stash, or reset.\n'
     self.assertRaisesError(exception, scm.update, options, (), [])
 
   def testUpdateNotGit(self):