diff options
Diffstat (limited to 'demo-script')
-rw-r--r-- | demo-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demo-script b/demo-script index 1bb72b7..0c18bf9 100644 --- a/demo-script +++ b/demo-script @@ -24,7 +24,7 @@ echo "now added 2nd line in master" >> FOO git add FOO git commit -q -m "2nd line" git merge test -git-cat-FOO -p test:FOO > FOO +git-cat-file -p test:FOO > FOO git add FOO git commit -q -m "merged" cat FOO |