X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d4f2b3e9bc83fd6e3063c856e3f1f203dcc5b304..809f4f1c1b59a01820f8d259306857cb42ef8ca8:/t/t1203-push-conflict.sh diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh index 57119ab..72bd49f 100755 --- a/t/t1203-push-conflict.sh +++ b/t/t1203-push-conflict.sh @@ -21,7 +21,7 @@ test_expect_success \ stg new foo -m foo && echo foo > test && echo fie > test2 && - stg add test test2 && + git add test test2 && stg refresh && stg pop ' @@ -31,7 +31,7 @@ test_expect_success \ ' stg new bar -m bar && echo bar > test && - stg add test && + git add test && stg refresh '