Show More
@@ -416,11 +416,11 b' def simplemerge(ui, local, base, other, ' | |||||
416 | name_a = local |
|
416 | name_a = local | |
417 | name_b = other |
|
417 | name_b = other | |
418 | labels = opts.get('label', []) |
|
418 | labels = opts.get('label', []) | |
419 | if labels: |
|
419 | if len(labels) > 0: | |
420 |
name_a = labels |
|
420 | name_a = labels[0] | |
421 | if labels: |
|
421 | if len(labels) > 1: | |
422 |
name_b = labels |
|
422 | name_b = labels[1] | |
423 | if labels: |
|
423 | if len(labels) > 2: | |
424 | raise util.Abort(_("can only specify two labels.")) |
|
424 | raise util.Abort(_("can only specify two labels.")) | |
425 |
|
425 | |||
426 | try: |
|
426 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now