Mercurial > hg
changeset 30861:e1526da1e6d8 stable 4.1
merge with i18n
| author | Kevin Bullock <kbullock+mercurial@ringworld.org> |
|---|---|
| date | Wed, 01 Feb 2017 10:15:10 -0600 |
| parents | 086c37652735 (diff) 54d3976dc623 (current diff) |
| children | d60b573b3991 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Feb 01 08:47:11 2017 -0200 +++ b/mercurial/merge.py Wed Feb 01 10:15:10 2017 -0600 @@ -1039,8 +1039,7 @@ for f in dms: dm, (f0, flags), msg = actions[f] assert dm == 'dm', dm - m, args, msg = actions[f0] - if m == 'r': + if f0 in actions and actions[f0][0] == 'r': # We have one bid for removing a file and another for moving it. # These two could be merged as first move and then delete ... # but instead drop moving and just delete.