diff mercurial/merge.py @ 12118:ab2ccdce985d

tests: unify test-incoming-outgoing
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 30 Aug 2010 14:10:31 +0900
parents ad787252fed6
children 28e2e3804f2e
line wrap: on
line diff