Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict @ 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 e506c14382fd
children 46280c004f22
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status