tests/test-simplemerge.py.out
author Siddharth Agarwal <sid0@fb.com>
Mon, 23 Nov 2015 19:06:15 -0800
changeset 27121 b08c31cfc4b6
parent 22023 f18830651811
permissions -rw-r--r--
merge.applyupdates: add all actions returned from merge state At the moment this is a no-op (the only actions defined are 'r', 'a' and 'g'), but soon we're going to add other sorts of actions to the dictionary returned from mergestate.actions().

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK