remote-hg: match hg merge behavior
commit6497a2bab5880dc353b83bb5d4615074d6552959
authorFelipe Contreras <felipe.contreras@gmail.com>
Sun, 4 Nov 2012 02:13:28 +0000 (4 03:13 +0100)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:35:20 +0000 (4 08:35 -0500)
treec62dc5277d624d4453340ddd5eb99291cc506639
parentff247d9e56366a3b03d8ca926fd88b51d3c2df52
remote-hg: match hg merge behavior

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
contrib/remote-helpers/git-remote-hg