diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-12 15:25:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 12:04:00 +0900 |
| commit | f08110ddd84438f4a8d69c145fae7f65fc91940f (patch) | |
| tree | 20a24c3caf03a01c058a526eb8a95d7eccc1c576 /t/t4013/diff.diff_initial..side | |
| parent | Ninth batch for 2.20 (diff) | |
| download | git-f08110ddd84438f4a8d69c145fae7f65fc91940f.tar.gz git-f08110ddd84438f4a8d69c145fae7f65fc91940f.zip | |
rebase -r: demonstrate bug with conflicting merges
When calling `merge` on a branch that has already been merged, that
`merge` is skipped quietly, but currently a MERGE_HEAD file is being
left behind and will then be grabbed by the next `pick` (that did
not want to create a *merge* commit).
Demonstrate this.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions