Mercurial > hg
comparison tests/test-flags @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 14 May 2006 21:07:34 -0700 |
parents | 7544700fd931 |
children | 455109df3669 |
comparison
equal
deleted
inserted
replaced
2282:2efa636eb411 | 2283:e506c14382fd |
---|---|
25 | 25 |
26 hg pull ../test2 | 26 hg pull ../test2 |
27 hg heads | 27 hg heads |
28 hg history | 28 hg history |
29 | 29 |
30 hg -v co -m | 30 hg -v merge |
31 | 31 |
32 ls -l ../test[12]/a > foo | 32 ls -l ../test[12]/a > foo |
33 cut -b 1-10 < foo | 33 cut -b 1-10 < foo |
34 | 34 |