equal
deleted
inserted
replaced
423 """Performs the simplemerge algorithm. |
423 """Performs the simplemerge algorithm. |
424 |
424 |
425 The merged result is written into `localctx`. |
425 The merged result is written into `localctx`. |
426 """ |
426 """ |
427 def readctx(ctx): |
427 def readctx(ctx): |
428 if not ctx: |
|
429 return None |
|
430 # Merges were always run in the working copy before, which means |
428 # Merges were always run in the working copy before, which means |
431 # they used decoded data, if the user defined any repository |
429 # they used decoded data, if the user defined any repository |
432 # filters. |
430 # filters. |
433 # |
431 # |
434 # Maintain that behavior today for BC, though perhaps in the future |
432 # Maintain that behavior today for BC, though perhaps in the future |