diff tests/test-merge5.t @ 18048:9b7288fc7bf2

run-tests: use correct python when run with --local
author Bryan O'Sullivan <bryano@fb.com>
date Mon, 10 Dec 2012 12:07:42 -0800
parents 6da47b655d97
children 76df01e56e7f
line wrap: on
line diff