Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-git-import.out @ 2899:bee4b7abcb01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Aug 2006 14:42:15 -0500
parents e2b69dbb2daa
children b70740aefa4d
comparison
equal deleted inserted replaced
2898:06c05c675a35 2899:bee4b7abcb01
1 % new file
2 applying patch from stdin
3 patching file new
4 % chmod +x
5 applying patch from stdin
6 % copy
7 applying patch from stdin
8 a
9 a
10 % rename
11 applying patch from stdin
12 copyx
13 new
14 rename
15 % delete
16 applying patch from stdin
17 patching file copyx
18 new
19 rename
20 % regular diff
21 applying patch from stdin
22 patching file rename
23 % copy and modify
24 applying patch from stdin
25 patching file copy2
26 a
27 a
28 b
29 a
30 a
31 % rename and modify
32 applying patch from stdin
33 patching file rename2
34 copy2: No such file or directory
35 a
36 a
37 b
38 c
39 a