##// END OF EJS Templates
test-shelve: shorten a long path so it works on Windows
Matt Harbison -
r28941:8353d154 default
parent child Browse files
Show More
@@ -1497,8 +1497,10 b' expect that after resolving conflicts an'
1497 running 'shelve --continue' the branch information won't be
1497 running 'shelve --continue' the branch information won't be
1498 restored and branch will be unchanged.
1498 restored and branch will be unchanged.
1499
1499
1500 $ hg init shelve_on_new_branch_conflict_with_previous_shelvedstate
1500 shelve on new branch, conflict with previous shelvedstate
1501 $ cd shelve_on_new_branch_conflict_with_previous_shelvedstate
1501
1502 $ hg init conflict
1503 $ cd conflict
1502 $ echo "aaa" >> a
1504 $ echo "aaa" >> a
1503 $ hg commit -A -m "a"
1505 $ hg commit -A -m "a"
1504 adding a
1506 adding a
General Comments 0
You need to be logged in to leave comments. Login now