Skip to content
Snippets Groups Projects
Commit 3e0eb85a authored by Augie Fackler's avatar Augie Fackler
Browse files

Merge test fixes.

parents b9c94c21 ff2d4f54
No related branches found
No related tags found
No related merge requests found
......@@ -70,8 +70,8 @@
cd ..
cd gitrepo2
git log master
git log beta
git log master | sed 's/\.\.\.//g'
git log beta | sed 's/\.\.\.//g'
cd ..
kill `cat gitdaemon.pid`
......@@ -74,7 +74,7 @@
hg push git://localhost/gitrepo2
cd ../gitrepo2
git log
git log | sed s/\\.\\.\\.//g
cd ..
kill `cat gitdaemon.pid`
......@@ -73,7 +73,7 @@
echo % some more work on master from git
cd gitrepo
git checkout master
git checkout master 2>&1 | sed s/\'/\"/g
echo delta > delta
git add delta
commit -m "add delta"
......
......@@ -36,7 +36,7 @@
git tag alpha
git checkout -b beta 2>&1 | sed s/\'/\"/g
git checkout -b beta 2>&1 | sed s/\'/\"/g
echo beta > beta
git add beta
commit -m 'add beta'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment