##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Diff in subdirectories from Jake Edge...
Diff in subdirectories from Jake Edge Dates in diff Fix O(n^2) behaviour of manifest diff Add a/ and b/ to work with patch -p1
mpm@selenic.com - - Load All Authors

File last commit:

r28:9f64ee81 default
r64:b3e2ddff default
Show More
simple-merge
22 lines | 221 B | text/plain | TextLexer
/ tests / simple-merge
History | Annotation | Raw |Copy content |Copy permalink
set -ex
export EDITOR=true
rm -rf test branch
mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..
cp -a test branch
cd branch
echo bar>>foo
hg commit
cd ../test
hg merge ../branch
hg verify