comparison tests/test-merge9.t @ 18630:9b9e2d9e83a1

merge: split out mostly-non-interactive working dir updates In a later patch, we'll run these updates in parallel.
author Bryan O'Sullivan <bryano@fb.com>
date Sat, 09 Feb 2013 15:21:58 -0800
parents f2719b387380
children 9209c02f1f25
comparison
equal deleted inserted replaced
18622:f9eebf5629fa 18630:9b9e2d9e83a1