summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-06 13:15:24 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-06 13:15:24 +0900
commit3ec7d702a89c647ddf42a59bc3539361367de9d5 (patch)
tree1b0d84bba176731b566db55d7a0cb3078fa3d994 /builtin/merge.c
parenta7d7f125e3c0e7e502e29e09df21d8471ee89edf (diff)
downloadgit-3ec7d702a89c647ddf42a59bc3539361367de9d5.tar.gz
The sixth batch post 2.14
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions