From a279ba3d48f30e6fb117d76a106aba777cc218a8 Mon Sep 17 00:00:00 2001 From: Leonid Volnitsky Date: Thu, 26 Dec 2013 20:02:47 +0200 Subject: Revert "retab on the rest of the files" This reverts commit 569178c05f02fa9f22a6fb7bd1baccf3765a866e. --- demo-script | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'demo-script') diff --git a/demo-script b/demo-script index ccd5019..1374a1f 100755 --- a/demo-script +++ b/demo-script @@ -2,7 +2,7 @@ cd p/git-prompt . ./git-prompt.sh cd test -d demo && rm -rf demo/ -test -d ../demo && cd .. && rm -rf demo/ +test -d ../demo && cd .. && rm -rf demo/ clear : ------------------------------------------------------------------------ clear @@ -15,21 +15,21 @@ touch untracked.o echo '*.o' >> .gitignore git commit -q -m "1st line" FOO git checkout -b test -echo "added 2nd line in test" >> FOO -git add FOO +echo "added 2nd line in test" >> FOO +git add FOO echo "2nd in BAR" > BAR git add BAR -echo "added 3nd line FOO" >> FOO +echo "added 3nd line FOO" >> FOO git add FOO git commit -q -m "FOO moded, BAR added" git checkout master -cat FOO -echo "now added 2nd line in master" >> FOO +cat FOO +echo "now added 2nd line in master" >> FOO git add FOO git commit -q -m "2nd line" git merge test git cat-file -p test:FOO > FOO -git add FOO +git add FOO git commit -q -m "merged" cat FOO git checkout HEAD^ -- cgit v1.2.3