diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-30 23:24:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-30 23:24:03 -0700 |
| commit | 5a10f4c3a16633556ab3b1b0e216e6ef07877932 (patch) | |
| tree | df1d136331f419440050cd605b8db5ca66055556 /commit.c | |
| parent | Merge branch 'cc/http-curlopt-resolve' (diff) | |
| parent | t6424: make sure a failed merge preserves local changes (diff) | |
| download | git-5a10f4c3a16633556ab3b1b0e216e6ef07877932.tar.gz git-5a10f4c3a16633556ab3b1b0e216e6ef07877932.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions