You still need to be acting like your changing lines, even though the shoulder line moves and you don't. Your lane is ending, so its your responsibility to merge safely, which includes giving way to the traffic in the lane your merging with and to signal your intent.
It does sound like you gave way, but just didn't signal. Also sounds like she was a jackass.