I had already posted this bug report yesterday but it was hidden in a
cover letter at
http://permalink.gmane.org/gmane.comp.version-control.git/93143 -- so
I'll copy the relevant info here:
The included testcases demonstrate that trivial merges are
currently broken. The failing test is:
git init
echo a > a
git add a
git commit -ma
git checkout -b branch
echo b > b
git add b
git commit -mb
git checkout master
git merge --no-ff -s resolve branch
Running this in 1.5.5 shows:
Trying really trivial in-index merge...
Wonderful.
In-index merge
while `next' gives
Trying really trivial in-index merge...
error: Untracked working tree file 'a' would be overwritten by merge.
Nope.
Trying simple merge.
Merge made by resolve.
Paolo
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
