Mercurial > hg
view tests/test-inotify.out @ 9778:6cb1808e5ae7
Merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 07 Nov 2009 14:13:15 -0600 |
parents | a87bc6e2a907 |
children | 95e1867f765b |
line wrap: on
line source
adding a adding b adding c adding d adding dir/bar/foo adding dir/x adding dir/y adding e % inserve ? hg.pid % clean C a C b C c C d C dir/bar/foo C dir/x C dir/y C e % all ? hg.pid C a C b C c C d C dir/bar/foo C dir/x C dir/y C e % path patterns M dir/x ? hg.pid M dir/x M x % issue 1375 adding h/h adding hg.pid removing h/h A h R h/h M a merging a 1 files updated, 1 files merged, 2 files removed, 0 files unresolved M a 3 files updated, 1 files merged, 0 files removed, 0 files unresolved M a