equal
deleted
inserted
replaced
1918 ### check phase |
1918 ### check phase |
1919 if not overwrite: |
1919 if not overwrite: |
1920 if len(pl) > 1: |
1920 if len(pl) > 1: |
1921 raise error.Abort(_(b"outstanding uncommitted merge")) |
1921 raise error.Abort(_(b"outstanding uncommitted merge")) |
1922 ms = wc.mergestate() |
1922 ms = wc.mergestate() |
1923 if list(ms.unresolved()): |
1923 if ms.unresolvedcount(): |
1924 raise error.Abort( |
1924 raise error.Abort( |
1925 _(b"outstanding merge conflicts"), |
1925 _(b"outstanding merge conflicts"), |
1926 hint=_(b"use 'hg resolve' to resolve"), |
1926 hint=_(b"use 'hg resolve' to resolve"), |
1927 ) |
1927 ) |
1928 if branchmerge: |
1928 if branchmerge: |