brae

i dont want to use filemerge for conflicts after running `sl rebase`. would prefer to just resolve the flags in my default editor. is there some simple config im missing...