Mercurial > hg > mercurial-crew-with-dirclash
view tests/simple-merge @ 149:8cd45e152c83
Pass filename to $HGMERGE
This lets the merge program be slightly more user-friendly
author | mpm@selenic.com |
---|---|
date | Tue, 24 May 2005 23:34:06 -0800 |
parents | 9f64ee817199 |
children |
line wrap: on
line source
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