Mercurial > hg
diff tests/test-merge6.out @ 6590:9f80e062d71c
status: rename type_ to state
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 12 May 2008 11:37:08 -0500 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 12 May 2008 11:37:08 -0500 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |