about summary refs log tree commit diff
path: root/builtin/merge.c