index 0b600bb429b69df02d971913e4b658bf7e313277..31c108161781165d5e32f08b95089086627eda64 100755 (executable)
git config branch.br-$remote-merge.merge refs/heads/three &&
git config branch.br-$remote-octopus.remote $remote &&
git config branch.br-$remote-octopus.merge refs/heads/one &&
- git config --add branch.br-$remote-octopus.merge two &&
- git config --add branch.br-$remote-octopus.merge remotes/rem/three
+ git config --add branch.br-$remote-octopus.merge two
done
'
} >"$actual" &&
if test -f "$expect"
then
- diff -u "$expect" "$actual" &&
+ git diff -u "$expect" "$actual" &&
rm -f "$actual"
else
# this is to help developing new tests.