Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2557:1727ff712a4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix push over https. Without this patch, python gives me a TypeError: write() argument 1 must be string or read-only buffer, not file
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 03 Jul 2006 00:23:58 -0300
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)