Description Maxime Jeanmart 2011-04-19 06:08:14 EDT

Build Identifier: M20110210-1200

Each time I merge 2 branches (either from same repo or from origin), I have all my files flagged as changed and must commit them all. 
It's hard after that to verify if the merge was correctly done because we don't have a way to quickly see what changed.
Remark: using eGit+jGit 0.11.3


Reproducible: Always

Steps to Reproduce:
1.Created the repository using "git extensions"
2. creates a Java project in repository
3. share the project
4. add 3 classes: A, B, C
5. create "work" branch, checkout
6. edit A, commit
7. checkout master
8. edit B, commit
9. checkout "work"
10. edit A, commit
11. checkout master
12. merge with "work"
13.now all files are marked "Mod., not staged", including C.java, .classpath and .project.