diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-19 11:59:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-19 12:03:00 -0700 |
| commit | 4b317450ce140c8c188afba79aed9a2e8e95d79e (patch) | |
| tree | b772dbb8bca91b2f6941fa2cd036984632dbda9b /commit.c | |
| parent | d516b2db0af2221bd6b13e7347abdcb5830b2829 (diff) | |
t6424: make sure a failed merge preserves local changes
We do make sure that an attempt to merge with various forms of local
changes will "fail", but the point of stopping the merge is so that
we refrain from discarding uncommitted local changes that could be
precious. Add a few more checks for each case to make sure the
local changes are left intact.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions