Mercurial > hg-stable
changeset 33950:3b2a002ef685
simplemerge: remove check for null context
Differential Revision: https://phab.mercurial-scm.org/D520
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Fri, 25 Aug 2017 13:49:16 -0700 |
| parents | 7cab956794e4 |
| children | 39d253d088a9 |
| files | mercurial/simplemerge.py |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Thu Aug 24 22:20:02 2017 +0900 +++ b/mercurial/simplemerge.py Fri Aug 25 13:49:16 2017 -0700 @@ -425,8 +425,6 @@ The merged result is written into `localctx`. """ def readctx(ctx): - if not ctx: - return None # Merges were always run in the working copy before, which means # they used decoded data, if the user defined any repository # filters.