view tests/test-conflict @ 1568:1d7d0c07e8f3

make all commands be repo-wide by default

- refactor code in commands.py so that:
  if no pattern is given, the command will be repo-wide
  else it will work on the working dir
- update the doc
- fix the tests

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status