[16:28] <LeoNerd> That thing that `bzr merge` can do on conflicts, where it outputs .orig and .rej pair files, so you can inspect content in either case and fix it up yourself... Does anyone know what that's called, and how I can get git to do the same?
[16:34] <fullermd> "acting sensibly", and "hahahaharight"?    :)
[16:37] <fullermd> Looks like there's a mergetool.writeToTemp config var that's probably applicable.