mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
#!/bin/sh
cat >> $HGRCPATH <<EOF
[extensions]
convert=
EOF
# Prepare orig repo
hg init orig
cd orig
echo foo > foo
HGUSER='user name' hg ci -qAm 'foo'
cd ..
# Explicit --authors
cat > authormap.txt <<EOF
user name = Long User Name
# comment
this line is ignored
EOF
hg convert --authors authormap.txt orig new
echo $?
cat new/.hg/authormap
hg -Rnew log
rm -rf new
# Implicit .hg/authormap
hg init new
mv authormap.txt new/.hg/authormap
hg convert orig new
echo $?
hg -Rnew log