diff tests/test-merge-default @ 3101:87ea5a71f7b9

merge: convert actions to list
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:10:56 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff