comparison tests/test-merge6.out @ 3101:87ea5a71f7b9

merge: convert actions to list
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:10:56 -0500
parents b2ae81a7df29
children 8feb33c2d153
comparison
equal deleted inserted replaced
3097:1b738357bba9 3101:87ea5a71f7b9