diff tests/test-merge-force.t @ 42020:00c1ee0f746a

shelve: add --keep to list of allowables
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sun, 24 Mar 2019 20:13:13 -0400
parents 5abc47d4ca6b
children 4764e8436b2a
line wrap: on
line diff