view tests/test-simplemerge.py.out @ 42013:50d5e64ec561

shelve: do not update when keeping changes, just move the dirstate This is to leave the working directory unchanged. We reuse the match object as an optimisation.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Fri, 22 Mar 2019 11:26:47 -0400
parents f18830651811
children
line wrap: on
line source

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

OK