view tests/test-merge2.out @ 8684:5bb7780b57c7

match: fold plan cases down to two special cases - merge always and match with patterns - make always and match with patterns the default - invert dostep3 to skipstep3 - move dirignore test inside exact case
author Matt Mackall <mpm@selenic.com>
date Sun, 31 May 2009 17:54:18 -0500
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head