equal
deleted
inserted
replaced
100 ui.status(_('not merging with %d other new branch heads ' |
100 ui.status(_('not merging with %d other new branch heads ' |
101 '(use "hg heads ." and "hg merge" to merge them)\n') % |
101 '(use "hg heads ." and "hg merge" to merge them)\n') % |
102 (len(newheads) - 1)) |
102 (len(newheads) - 1)) |
103 return 1 |
103 return 1 |
104 |
104 |
|
105 if not newheads: |
|
106 return 0 |
|
107 |
105 # Otherwise, let's merge. |
108 # Otherwise, let's merge. |
106 err = False |
109 err = False |
107 if newheads: |
110 if newheads: |
108 # By default, we consider the repository we're pulling |
111 # By default, we consider the repository we're pulling |
109 # *from* as authoritative, so we merge our changes into |
112 # *from* as authoritative, so we merge our changes into |