Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge5.out @ 3101:87ea5a71f7b9
merge: convert actions to list
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 15:10:56 -0500 |
parents | 49988d9f0758 |
children | 41989e55fa37 |