summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Dusty Phillips <dusty@linux.ca>2013-04-11 07:22:58 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-11 10:46:46 -0700
commite1219e45bdcb3f6b298bdee21fe07ddfa38778ef (patch)
tree8a22241f650202d62d031298b4c183705316d27d /git-merge-resolve.sh
parentremote-hg: trivial cleanups (diff)
downloadtgif-e1219e45bdcb3f6b298bdee21fe07ddfa38778ef.tar.xz
remote-hg: add missing config variable in doc
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions