[stock_toaster]

I use this in my ~/.gitconfig

   [diff]
   algorithm = patience