git.99rst.org Git - git.git/commit

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9b782d2 cce076e)

author	Junio C Hamano <redacted>
	Tue, 3 May 2016 21:08:17 +0000 (14:08 -0700)
committer	Junio C Hamano <redacted>
	Tue, 3 May 2016 21:08:17 +0000 (14:08 -0700)
commit	b97414352746967c72e5b87cce39efea4b93e2bf
tree	2737978df20165cd0149efde1ed35cca7e2611e8	tree \| snapshot
parent	9b782d297c141cc45973c8b455cc93495d86b277	commit \| diff
parent	cce076e37107217faa942dddc20e79ae7350bc1f	commit \| diff

Merge branch 'nf/mergetool-prompt'

UI consistency improvements.

* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent

git-mergetool--lib.sh	diff1 \|	diff2 \|	blob \| history
git-mergetool.sh	diff1 \|	diff2 \|	blob \| history
t/t7800-difftool.sh	diff1 \|	diff2 \|	blob \| history

git clone https://git.99rst.org/PROJECT