index f2214dd0fa5055ecbd824e41080ec39c25ce57f9..11139048fe2238a3e06972252d7410da4058dccb 100755 (executable)
'
test_expect_success 'retain authorship when squashing' '
- git show HEAD | grep "^Author: Nitfol"
+ git show HEAD | grep "^Author: Twerp Snog"
'
test_expect_success 'preserve merges with -p' '