diff tests/test-simplemerge.py @ 16588:72319bfd7966

phases: line.strip().split() == line.split()
author Martin Geisler <mg@aragost.com>
date Fri, 04 May 2012 15:24:00 +0200
parents 7de7630053cb
children d08b333816c6
line wrap: on
line diff