Rewrite aliases relatively
Reorganize aliases
Use -w instead of --ignore-space-change
Define tl using hist
Add histm/t
Factor out mine/theirs logic, comment sections
Shorten st -> s, sts -> st
Finish comment