Show More
@@ -69,7 +69,7 b' def countrate(ui, repo, amap, *pats, **o' | |||||
69 | else: |
|
69 | else: | |
70 | parents = ctx.parents() |
|
70 | parents = ctx.parents() | |
71 | if len(parents) > 1: |
|
71 | if len(parents) > 1: | |
72 |
ui.note(_(' |
|
72 | ui.note(_('revision %d is a merge, ignoring...\n') % (rev,)) | |
73 | return |
|
73 | return | |
74 |
|
74 | |||
75 | ctx1 = parents[0] |
|
75 | ctx1 = parents[0] |
General Comments 0
You need to be logged in to leave comments.
Login now