]> git.99rst.org Git - git.git/commitdiff
git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60be293 4b31745)
Merge branch 'jc/t6424-failing-merge-preserve-local-changes'
authorJunio C Hamano <redacted>
Tue, 31 May 2022 06:24:03 +0000 (23:24 -0700)
committerJunio C Hamano <redacted>
Tue, 31 May 2022 06:24:03 +0000 (23:24 -0700)
The tests that ensured merges stop when interfering local changes
are present did not make sure that local changes are preserved; now
they do.

* jc/t6424-failing-merge-preserve-local-changes:
  t6424: make sure a failed merge preserves local changes


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