114
114
assert (message.startswith("pending merges:\n")), message
115
115
assert (message.endswith("Empty commit 2\n")), message
120
118
merge(["./branch", -1], [None, None], this_dir = './copy')
121
119
message = self.status_string(b_2)
122
120
assert (message.startswith("pending merges:\n")), message