git.eshelyaron.com Git - emacs.git/commit

author	Stefan Kangas <stefankangas@gmail.com>
	Sat, 19 Apr 2025 08:35:59 +0000 (10:35 +0200)
committer	Eshel Yaron <me@eshelyaron.com>
	Mon, 21 Apr 2025 20:39:04 +0000 (22:39 +0200)
commit	58f4c47ccf11d4b9cf02692b44ceca21a2e6a357
tree	036debbc59d9e8b93fe4864e9e067983c2023a8a	tree \| snapshot
parent	9cc734ee5a2ce180dc5e27a762b6402f0638e1f4	commit \| diff

; Fix failing diff-mode tests

* test/lisp/vc/diff-mode-resources/git.patch: Delete file, moving
its contents to...
* test/lisp/vc/diff-mode-tests.el (diff-mode-tests--git-patch):
...this new variable. Git merges kept deleting a trailing
whitespace in the patch signature, so let's do this instead.
(diff-mode-test-git-patch)
(diff-mode-test-git-patch/before-first-hunk)
(diff-mode-test-git-patch/signature): Use above new variable.

(cherry picked from commit 87d615e26cc565cd49be79d08116354341d1af93)

test/lisp/vc/diff-mode-resources/git.patch	[deleted file]	blob \| history
test/lisp/vc/diff-mode-tests.el		diff \| blob \| history