summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Heiko Voigt <hvoigt@hvoigt.net>2012-05-14 19:32:08 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-14 11:14:07 -0700
commitcb2df369804e9633f21f00be5ffb1a581955c956 (patch)
tree91ed2c53a88fccf23dea06c1eccffa6f5d7be8f0 /builtin/merge-ours.c
parentpack-protocol: fix first-want separator in the examples (diff)
downloadtgif-cb2df369804e9633f21f00be5ffb1a581955c956.tar.xz
link to gitmodules page at the beginning of git-submodule documentation
This way the user does not have to scroll down to the bottom to find it. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions