tests/test-simplemerge.py.out
author Martijn Pieters <mj@zopatista.com>
Wed, 29 Apr 2009 11:39:49 +0200
changeset 8241 dd1b47e17d7e
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
Fix typeerror when specifying both --rebase and --pull

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK