index 718c9c1fa31fa63fee65a7da857f0c9378af3c5c..6c92d61192570d0d1d7a35e1304e9c8046926410 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' '