diff tests/test-casecollision-merge.t @ 31516:2915cc1d3429 stable

subrepo: move prompts out of the if (issue5505) Prompts weren't available in the else clause
author Simon Farnsworth <simonfar@fb.com>
date Mon, 20 Mar 2017 04:36:55 -0700
parents 2b955fec91e0
children 8e472f3b7c63
line wrap: on
line diff