diff tests/test-unrelated-pull.out @ 3102:36b08cd92fb7

merge: add codes to action list, eliminate None elements
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:24:00 -0500
parents ced2d3620f95
children 8c4fd0de5de8
line wrap: on
line diff