tests/test-simplemerge.py.out
author Kevin Bullock <kbullock@ringworld.org>
Wed, 07 Dec 2011 11:23:13 -0600
changeset 15620 73faa2664909
parent 4363 2e3c54fb79a3
child 22023 f18830651811
permissions -rw-r--r--
bookmarks: clarify help for use of merge and update

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

OK