Mercurial > hg

view tests/test-merge8.out @ 11566:4d11fde55cc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: use fakebuffer as buffer in py3k There's no buffer type in py3k, util.py has a function, called fakebuffer, that implements a similar API. This patch implements fakebuffer as a memoryview wrapper in py3k.
author Renato Cunha <renatoc@gmail.com>
date Wed, 14 Jul 2010 22:59:57 -0300
parents a3d73b3e1f8a
children
line wrap: on
line source

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved