dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.

[profile] / dot / gdbinit

### GDB configuration

set tui border-kind ascii
set disassembly-flavor intel
set disassemble-next-line auto
set history save on
set confirm off