A bug in git merge

Hi,

If I cherry-pick a commit that added a line, then merge another commit which removes this line, the line remains in the file instead of being removed.

The following script demonstrates the bug.

file should be equivalent on both branches

git init seq 1 20 > file git add file git commit -m 'Initial' sed -i "s/^5/5\n55/" file git commit -a -m 'Added 55' git checkout -b other HEAD^ git cherry-pick master git commit --amend --author 'Author <a@b.c>' --no-edit # generate a new hash sed -i '/55/d' file git commit -a -m 'Removed 55' git checkout master git merge --no-edit other git diff other # Should be equal

- Orgad