summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 23:07:46 +0100
committerLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 16:31:32 +0100
commita7312d1a28ff3ab0a5a5427b35f01d943103cba8 (patch)
tree89c6a6feba2f627d14aa1c05d408a4215c14a3d1 /builtin/merge.c
parentSync with 2.22.2 (diff)
downloadtgif-a7312d1a28ff3ab0a5a5427b35f01d943103cba8.tar.xz
Git 2.23.1
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions