summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-07-28 23:52:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-07-28 23:59:30 -0700
commite276f018f2c1f0fc962fbe44a36708d1cdebada8 (patch)
treec626803af06e90a93cc45133b7b7b3e1a54bcb28 /Documentation/merge-options.txt
parentconfig.txt: document add.ignore-errors (diff)
downloadtgif-e276f018f2c1f0fc962fbe44a36708d1cdebada8.tar.xz
GIT 1.6.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions