Mercurial > hg
diff tests/test-conflict.t @ 16588:72319bfd7966
phases: line.strip().split() == line.split()
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Fri, 04 May 2012 15:24:00 +0200 |
parents | 2371f4aea665 |
children | 25d5a9ecbb85 |
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Fri, 04 May 2012 15:24:00 +0200 |
parents | 2371f4aea665 |
children | 25d5a9ecbb85 |