diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-06-25 20:39:26 +0300 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-06-25 20:39:26 +0300 |
| commit | cfd299e9f22ac4c1ede0317dac69e5ca611c439e (patch) | |
| tree | 3a87233138823bb98a03defece89c73d6591c54e /demo-script | |
| parent | rfct: cleaner vcs_info composition (diff) | |
| download | git-prompt-cfd299e9f22ac4c1ede0317dac69e5ca611c439e.tar.gz git-prompt-cfd299e9f22ac4c1ede0317dac69e5ca611c439e.tar.bz2 git-prompt-cfd299e9f22ac4c1ede0317dac69e5ca611c439e.zip | |
fix: wrang state. +cleanup
Diffstat (limited to 'demo-script')
| -rw-r--r-- | demo-script | 7 |
1 files changed, 4 insertions, 3 deletions
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 |