diff tests/test-merge6.t @ 24872:3510ec97ffdc stable

shelve: make the interactive mode experimental While fixing issue4304: "record: allow editing new files" we introduced changes in record/crecord. These changes need to be matched with changes in any command using record. Shelve is one of these commands and the changes have not been made for this release. Therefore, shelve -i should be an experimental feature for this release.
author Laurent Charignon <lcharignon@fb.com>
date Mon, 27 Apr 2015 15:36:10 -0700
parents f2719b387380
children 2428e8ec0793
line wrap: on
line diff