diff tests/test-conflict.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 2371f4aea665
children 25d5a9ecbb85
line wrap: on
line diff