Mercurial Mercurial > hg-stable / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Wed, 30 Jan 2008 17:30:34 -0600
changeset 5935 0973501e5f4a
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
win32: remove excessive flushing Our Windows file code was flushing buffers from the operating system to disk, rather than from the application to the operating system.

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