Mercurial > hg
diff tests/test-merge-default.out @ 3108:67874ebbb7dd
merge: linear_path -> linear
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 16:50:17 -0500 |
parents | 013921c753bd |
children | 9cd6578750b9 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 16:50:17 -0500 |
parents | 013921c753bd |
children | 9cd6578750b9 |