diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-06-23 01:03:51 +0300 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-06-23 01:03:51 +0300 |
| commit | f82eeda04d06d3a9ffe7c8d58e589c9b93f19eca (patch) | |
| tree | 1e7929fde64918a0e08e62b8cbf9e7d4c920c1fe /demo-script | |
| parent | WIP (diff) | |
| parent | compied: added (diff) | |
| download | git-prompt-f82eeda04d06d3a9ffe7c8d58e589c9b93f19eca.tar.gz git-prompt-f82eeda04d06d3a9ffe7c8d58e589c9b93f19eca.tar.bz2 git-prompt-f82eeda04d06d3a9ffe7c8d58e589c9b93f19eca.zip | |
Merge branch 'git'
Conflicts:
demo-script
prompt
Diffstat (limited to 'demo-script')
| -rw-r--r-- | demo-script | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demo-script b/demo-script index 0c18bf9..58e269a 100644 --- a/demo-script +++ b/demo-script @@ -1,3 +1,4 @@ +<<<<<<< HEAD:demo-script . /t/prompt/prompt test -d demo && rm -rf demo/ test -d ../demo && cd .. && rm -rf demo/ |