diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2012-11-04 03:13:28 +0100 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-04 08:35:20 -0500 |
| commit | 6497a2bab5880dc353b83bb5d4615074d6552959 (patch) | |
| tree | c62dc5277d624d4453340ddd5eb99291cc506639 /git.c | |
| parent | ff247d9e56366a3b03d8ca926fd88b51d3c2df52 (diff) | |
| download | git-6497a2bab5880dc353b83bb5d4615074d6552959.tar.gz git-6497a2bab5880dc353b83bb5d4615074d6552959.tar.xz | |
remote-hg: match hg merge behavior
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions