search

jayduhon / inferno-os

Automatically exported from code.google.com/p/inferno-os
2 stars 0 forks source link

inferno.zip merge conflict #316

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
What steps will reproduce the problem?
download/unpack http://www.vitanuova.com/dist/4e/inferno.zip
hg pull
hg up

What is the expected output? What do you see instead?
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

Which operating system are you using?
Win7x64

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

Original issue reported on code.google.com by powerman...@gmail.com on 25 Jun 2014 at 11:33

GoogleCodeExporter commented 9 years ago 
This happens because these .h files use CRLF instead of LF.

Original comment by powerman...@gmail.com on 26 Jun 2014 at 9:16