# Test special cases of merge.
I setup2.inc
> branch b1
<<<
+ h.txt wug2.txt
> add h.txt
<<<
> commit "Add h.txt"
<<<
> branch b2
<<<
> rm f.txt
<<<
> commit "remove f.txt"
<<<
> merge b1
Given branch is an ancestor of the current branch.
<<<
> checkout b2
<<<
= f.txt wug.txt
> merge master
Current branch fast-forwarded.
<<<
* f.txt