summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-05-24 21:30:04 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-28 08:02:25 -0700
commitc9eaef125bbecd60a8b328d58e66306d5db1357a (patch)
treec6444803cf4188a4f6502c7192b3299ad8e2f186 /Documentation/git-mergetool--lib.txt
parentremote-hg: add support for --dry-run (diff)
downloadtgif-c9eaef125bbecd60a8b328d58e66306d5db1357a.tar.xz
remote-hg: add support for --force
And get rid of the remote-hg.force-push option hack. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions