summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Steffen Prohaska <prohaska@zib.de>2007-10-02 08:14:37 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-01 23:27:20 -0700
commit63a1f810a6f976a307aaaabdce21082f6d7f20aa (patch)
treed5013a8562df3f1afd8863d0d3a0e75e41b855ad /Documentation/merge-options.txt
parentWhip post 1.5.3.3 maintenance series into shape. (diff)
downloadtgif-63a1f810a6f976a307aaaabdce21082f6d7f20aa.tar.xz
fixed link in documentation of diff-options
Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions