Mercurial > python-hglib

diff tests/test-resolve.py @ 134:1b47146a4a2c 1.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style: fix long lines
author Matt Mackall <mpm@selenic.com>
date Tue, 30 Sep 2014 12:48:04 -0500
parents 939d1d763bb1
children 4359cabcb0cc
line wrap: on
line diff
--- a/tests/test-resolve.py	Tue Sep 30 11:23:15 2014 -0500
+++ b/tests/test-resolve.py	Tue Sep 30 12:48:04 2014 -0500
@@ -18,8 +18,10 @@
         self.append('b', 'a')
         rev, self.node3 = self.client.commit('third')
 
-        self.assertRaises(hglib.error.CommandError, self.client.merge, self.node1)
-        self.assertRaises(hglib.error.CommandError, self.client.resolve, all=True)
+        self.assertRaises(hglib.error.CommandError, self.client.merge,
+                          self.node1)
+        self.assertRaises(hglib.error.CommandError,
+                          self.client.resolve, all=True)
 
         self.assertEquals([('U', 'a'), ('U', 'b')],
                           self.client.resolve(listfiles=True))