Show More
| @@ -66,7 +66,7 b" don't allow marking or unmarking driver-" | |||
|
|
66 | 66 | > def markdriver(ui, repo, *pats, **opts): |
|
|
67 | 67 | > wlock = repo.wlock() |
|
|
68 | 68 | > try: |
|
|
69 | > ms = merge.mergestate(repo) | |
|
|
69 | > ms = merge.mergestate.read(repo) | |
|
|
70 | 70 | > m = scmutil.match(repo[None], pats, opts) |
|
|
71 | 71 | > for f in ms: |
|
|
72 | 72 | > if not m(f): |
General Comments 0
You need to be logged in to leave comments.
Login now