comparison tests/test-merge5.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 6da47b655d97
children 76df01e56e7f
comparison
equal deleted inserted replaced
18622:f9eebf5629fa 18630:9b9e2d9e83a1