QoL improvements for Git

[Rudxain]

I see you use diff3. You might like the new zdiff3 which was added around 2022.

BTW, log --graph is surprisingly expensive to compute. I had to split my alias in 2, because repos such as termux-packs made the cmd horribly slow!

[eevee]

oh, zdiff3 looks nice. (though i don't run into a lot of conflicts lately since i've mostly been doing solo work)

tbh i completely forgot i had any of those aliases — i just use tig to browse a commit graph!