# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2016-04-16 02:53:53
# Node ID 8353d154a9bde6bfa1fe9ef7e4d2a8de3d9d8e2c
# Parent  4a359b8f8fae92bf230f21d9f4824e49682f643e

test-shelve: shorten a long path so it works on Windows

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1497,8 +1497,10 @@ expect that after resolving conflicts an
 running 'shelve --continue' the branch information won't be
 restored and branch will be unchanged.
 
-  $ hg init shelve_on_new_branch_conflict_with_previous_shelvedstate
-  $ cd shelve_on_new_branch_conflict_with_previous_shelvedstate
+shelve on new branch, conflict with previous shelvedstate
+
+  $ hg init conflict
+  $ cd conflict
   $ echo "aaa" >> a
   $ hg commit -A -m "a"
   adding a