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