view tests/test-merge2.out @ 3103:e6818b0b8154

merge: move set_exec to actions
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:59:59 -0500
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b