view tests/test-simplemerge.py.out @ 18849:b4ddc43ddf9d

bookmarks.updatefromremote: rename local rb to remotemarks This local will become a parameter in an upcoming patch, so give it a more descriptive name. The name stays similar to the existing localmarks.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 29 Mar 2013 18:28:59 -0700
parents 2e3c54fb79a3
children f18830651811
line wrap: on
line source

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

OK