view tests/test-merge5.out @ 6339:ed9b07a97587

util: check fileno() validity in win32 set_binary()
author Patrick Mezard <pmezard@gmail.com>
date Fri, 21 Mar 2008 21:56:55 +0100
parents 4b0c9c674707
children 6aa4a3fa4e60
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes