comparison tests/test-bad-pull @ 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 d22d730c96ed
children 7012c889e8f2
comparison
equal deleted inserted replaced
3101:87ea5a71f7b9 3102:36b08cd92fb7