Hi I'm trying to merge my trunk into my feature branch. I'm coming up with a lot of expected tree conflicts (shown below).
Is there an quick/shorthand way to diff this to see the differences between
the copies?
C
business_services/main_servlet/src/main/resources/testconfigs/pams.properties
> local add, incoming add upon merge
Regards
Kiren
