Mercurial > hg

diff mercurial/simplemerge.py @ 14832:d60e4f227d75 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix parsing patch files containing CRs not followed by LFs Since 1e64e1e12195 , patch lines containing a CR not followed by a LF would be incorrectly splitten, causing a failure to apply the patch.
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 04 Jul 2011 19:53:39 -0300
parents 48ec0763afbb
children 774da7121fc9
line wrap: on
line diff