inferno.zip merge conflict

[Former user]

Original issue 316 created by inferno-os on 2014-06-25T23:33:27.000Z:

<b>What steps will reproduce the problem?</b> download/unpack http://www.vitanuova.com/dist/4e/inferno.zip hg pull hg up

<b>What is the expected output? What do you see instead?</b> C:\inferno>hg up merging libinterp/keyring.h warning: conflicts during merge. merging libinterp/keyring.h incomplete! (edit conflicts, then use 'hg resolve --mark') merging libinterp/runt.h warning: conflicts during merge. merging libinterp/runt.h incomplete! (edit conflicts, then use 'hg resolve --mark') 3038 files updated, 0 files merged, 106 files removed, 2 files unresolved use 'hg resolve' to retry unresolved file merges

<b>Which operating system are you using?</b> Win7x64

<b>Please provide any additional information below.</b> Inferno builds ok after this: hg revert -r tip libinterp\keyring.h hg revert -r tip libinterp\runt.h

[Former user]

Comment #1 originally posted by inferno-os on 2014-06-26T09:16:23.000Z:

This happens because these .h files use CRLF instead of LF.