Mercurial > hg

diff tests/test-doctest.py @ 48556:ce8c82a5cd65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: convert `merge_lines()` away from generator We always consume all the lines and put them in a list anyway. By making the function not a generator, we can later make it return an additional value (to indicate if there were conflicts). Differential Revision: https://phab.mercurial-scm.org/D11973
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 07 Jan 2022 18:42:31 -0800
parents b0e92313107e
children 46d12f7762e4
line wrap: on
line diff