##// END OF EJS Templates
filemerge: add a 'leave unresolved' option to regular prompts...
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.

File last commit:

r26066:89872688 default
r27162:4ab69be0 default
Show More
bzr-definitions
16 lines | 327 B | text/plain | TextLexer
# this file holds the definitions that are used in various bzr tests
TERM=dumb; export TERM
echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH
glog()
{
hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
}
manifest()
{
echo "% manifest of $2"
hg -R $1 manifest -v -r $2
}