From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2022 06:24:03 +0000 (-0700)
Subject: Merge branch 'jc/t6424-failing-merge-preserve-local-changes'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=5a10f4c3a16633556ab3b1b0e216e6ef07877932;p=rit

Merge branch 'jc/t6424-failing-merge-preserve-local-changes'

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
---

5a10f4c3a16633556ab3b1b0e216e6ef07877932