summaryrefslogtreecommitdiff
path: root/diffcore-break.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-03 14:08:17 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-03 14:08:17 -0700
commitb97414352746967c72e5b87cce39efea4b93e2bf (patch)
tree2737978df20165cd0149efde1ed35cca7e2611e8 /diffcore-break.c
parent9b782d297c141cc45973c8b455cc93495d86b277 (diff)
parentcce076e37107217faa942dddc20e79ae7350bc1f (diff)
downloadgit-b97414352746967c72e5b87cce39efea4b93e2bf.tar.gz
Merge branch 'nf/mergetool-prompt'
UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions