merge: make 'keep' message more descriptive
Most merge action messages don't describe the action itself, they
describe the reason the action was taken. The only exeption is the 'k'
action, for which the message is just "keep" and instead there is a
code comment folling it that says "remote unchanged". Let's move that
comment into the merge action message.
#require test-repo
Enable obsolescence to avoid the warning issue when obsmarker are found
$ cat >> $HGRCPATH << EOF
> [experimental]
> evolution=createmarkers
> EOF
Go back in the hg repo
$ cd $TESTDIR/..
$ for node in `hg log --rev 'draft() and ::.' --template '{node|short}\n'`; do
> hg export $node | contrib/check-commit > ${TESTTMP}/check-commit.out
> if [ $? -ne 0 ]; then
> echo "Revision $node does not comply to commit message rules"
> echo '------------------------------------------------------'
> cat ${TESTTMP}/check-commit.out
> echo
> fi
> done