Show More
@@ -15,7 +15,7 b' hg ci -m \'cp foo bar; change both\' -d "1' | |||||
15 | # in another branch, change foo in a way that doesn't conflict with |
|
15 | # in another branch, change foo in a way that doesn't conflict with | |
16 | # the other changes |
|
16 | # the other changes | |
17 | hg up -qC 0 |
|
17 | hg up -qC 0 | |
18 |
echo line 0 > |
|
18 | echo line 0 > foo | |
19 | hg cat foo >> foo |
|
19 | hg cat foo >> foo | |
20 | hg ci -m 'change foo' -d "1000000 0" |
|
20 | hg ci -m 'change foo' -d "1000000 0" | |
21 |
|
21 |
General Comments 0
You need to be logged in to leave comments.
Login now