From cfd299e9f22ac4c1ede0317dac69e5ca611c439e Mon Sep 17 00:00:00 2001
From: Leonid Volnitsky <Leonid@Volnitsky.com>
Date: Wed, 25 Jun 2008 20:39:26 +0300
Subject: fix: wrang state.  +cleanup

---
 demo-script | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'demo-script')

diff --git a/demo-script b/demo-script
index 58e269a..69245e6 100644
--- a/demo-script
+++ b/demo-script
@@ -1,4 +1,4 @@
-<<<<<<< HEAD:demo-script
+set +xv
 . /t/prompt/prompt 
 test -d demo && rm -rf demo/
 test -d ../demo && cd .. && rm -rf demo/ 
@@ -10,11 +10,11 @@ echo "1st line" > FOO
 git add FOO
 touch  untracked.o
 rm     untracked.o
-git commit -q -m "1st line"  FOO
+git commit -q -m "FOO's 1st line" 
 git checkout -b test
 echo "added 2nd line in test" >> FOO 
 git add FOO 
-echo "2nd FOO" > BAR
+echo "1st BAR" > BAR
 git add BAR
 echo "added 3nd line" >> FOO 
 git add FOO
@@ -31,3 +31,4 @@ git commit -q -m "merged"
 cat FOO
 git checkout HEAD^
 cat FOO
+git checkout master
-- 
cgit v1.2.3