| commit | 5a10f4c3a16633556ab3b1b0e216e6ef07877932 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2022 06:24:03 +0000 (30 23:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 May 2022 06:24:03 +0000 (30 23:24 -0700) | ||
| tree | df1d136331f419440050cd605b8db5ca66055556 | treesnapshot (tar.gz zip) |
| parent | 60be29398a555ac99b7bb8e322259590e36940e4 | commitdiff |
| parent | 4b317450ce140c8c188afba79aed9a2e8e95d79e | commitdiff |
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
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