Show More
@@ -1922,13 +1922,9 b' def _update(' | |||||
1922 | hint = _(b"use 'hg resolve' to resolve") |
|
1922 | hint = _(b"use 'hg resolve' to resolve") | |
1923 | raise error.StateError(msg, hint=hint) |
|
1923 | raise error.StateError(msg, hint=hint) | |
1924 | if branchmerge: |
|
1924 | if branchmerge: | |
|
1925 | m_a = _(b"merging with a working directory ancestor has no effect") | |||
1925 | if pas == [p2]: |
|
1926 | if pas == [p2]: | |
1926 | raise error.Abort( |
|
1927 | raise error.Abort(m_a) | |
1927 | _( |
|
|||
1928 | b"merging with a working directory ancestor" |
|
|||
1929 | b" has no effect" |
|
|||
1930 | ) |
|
|||
1931 | ) |
|
|||
1932 | elif pas == [p1]: |
|
1928 | elif pas == [p1]: | |
1933 | if not mergeancestor and wc.branch() == p2.branch(): |
|
1929 | if not mergeancestor and wc.branch() == p2.branch(): | |
1934 | raise error.Abort( |
|
1930 | raise error.Abort( |
General Comments 0
You need to be logged in to leave comments.
Login now