eol: separate .hgeol parsing from merge in ui
This will help refactoring the hook.
#!/usr/bin/env python# Filter output by the progress extension to make it readable in testsimportsys,reforlineinsys.stdin:line=re.sub(r'\r+[^\n]',lambdam:'\n'+m.group()[-1:],line)sys.stdout.write(line)print