git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 13 May 2021 23:26:06 +0000 (08:26 +0900)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 13 May 2021 23:26:06 +0000 (08:26 +0900)
commit	65c18913deeba4c5f0ca9488b1d8b6757ffc56e1
tree	96d55f99777aa2bc3446587a0a67d2583f5c88c5	tree \| snapshot
parent	df6c4f722c94641d5a9ea5496511f7043433abc2	commit \| diff
parent	0324e8fc6b297c9e61745dc4e7d110780334157d	commit \| diff

Merge branch 'pw/word-diff-zero-width-matches'

The word-diff mode has been taught to work better with a word
regexp that can match an empty string.

* pw/word-diff-zero-width-matches:
word diff: handle zero length matches

diff.c	diff1 \|	diff2 \|	blob \| history
t/t4034-diff-words.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

diff.c	diff1 \|	diff2 \|	blob \| history
t/t4034-diff-words.sh	diff1 \|	diff2 \|	blob \| history