diff tests/test-merge2.t @ 17936:95fc4ab324df

run-tests: backout 4a4173519b63 This deleted work in progress to eliminate child processes for -j.
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Nov 2012 18:08:39 -0600
parents f2719b387380
children 1850066f9e36
line wrap: on
line diff