Halle Berry and Gabriel Aubry have called a truce following the brawl between Aubry and Berry's French fiancé Olivier Martinez.

The former couple – who have a four-year-old daughter Nahla together – have been at war over Halle’s failed bid to take the youngster to live in France, culminating in an altercation between Halle’s fiancé Olivier Martinez and Gabriel on Thanksgiving.

Halle took out an emergency protective order against Gabriel following the fight, banning him from going near her, Nahla or Olivier but the duo came to an agreement on how to proceed on Thursday as the order was due to expire.

Incognito: Halle Berry shields her face from cameras as she takes her daughter Nahla to school in Los Angeles on Thursday

Canadian
model Gabriel had also secured his own temporary restraining order
against Olivier, claiming the actor had tried to kill him.

Although
he was initially charged with battery and bail was set at $20,000,
Gabriel has since said he wants criminal charges brought against his
adversary,
claiming he did nothing to provoke their fight - which left him battered
and bruised - and Olivier was the instigator.

Police sources tell TMZ the men
traded verbal barbs during the altercation but Aubry never alerted
authorities about alleged death threats he received from
Martinez prior to the incident.

Law enforcement has reportedly
declared the fight 'mutual combat', making it almost certain
criminal charges will not be filed.

The fight followed a bitter custody
dispute which saw Halle fail in her attempt to move to Paris with her
daughter.

Donald Trump meanwhile inserted himself into the drama on Wednesday.

Taking to Twitter, the real-estate
mogul wrote: 'Gabriel Aubry should learn how to fight - he became a
punching bag. Always drama with Halle B!'

Something to talk about: The real-estate mogul posted this tweet on Wednesday

Meanwhile Halle is selling the Hollywood Hills mansion where the fight broke out, for $15 million.

She
reportedly approached broker Billy Rose - who works for high-end
company The Agency - and the property has been given a pocket listing,
meaning it is not advertised publicly. .

Billy
is very familiar with the five bedroom Tuscan-style estate, which has a
huge backyard, pool and spa as he owned it a decade ago, renovated it
and sold it to actor Frankie Muniz. Frankie later sold the property on
to Halle.

Scene: Berry has reportedly put the Hollywood home where the fight occurred on the market