diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-06-30 18:25:01 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-11 09:38:36 -0700 |
| commit | 7f5271fa1584d99fb3c83f308f35295ed78c8b8b (patch) | |
| tree | dc14c7771369f587d6e0c20f47f925840f25b49f /t/t4018/cpp-operator-definition | |
| parent | merge-recursive: fix assumption that head tree being merged is HEAD (diff) | |
| download | tgif-7f5271fa1584d99fb3c83f308f35295ed78c8b8b.tar.xz | |
t6044: add more testcases with staged changes before a merge is invoked
According to Documentation/git-merge.txt,
...[merge will] abort if there are any changes registered in the index
relative to the `HEAD` commit. (One exception is when the changed
index entries are in the state that would result from the merge
already.)
Add some tests showing that this exception, while it does accurately state
what would be a safe condition under which we could allow the merge to
proceed, is not what is actually implemented.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4018/cpp-operator-definition')
0 files changed, 0 insertions, 0 deletions