When I run “git merge” from dev-A tp dev-B, I input the following commands in the console.
git checkout dev-A
git checkout dev-B
git merge dev-A &> LOG
And after that, what can i get in the LOG is the program name which has been changed in branch dev-A, whether it just fast forward into the dev-B or make conflicts when merging.
But I want the program list without the program whose codes just are changed in the dev-A only. It means I want the program list whose codes are changed both in dev-A and dev-B,including the one which make confilcts in merging and the other one not.
I draw a picture to discuribe the situation.
And I want the green part and the red part in the picture.