summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Gustaf Hendeby <hendeby@isy.liu.se>2008-05-05 00:33:10 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-05 16:54:16 -0700
commitda060c67ae5653e5bc59196ff3dbedb7f8faa594 (patch)
tree1b36e052a1ef8a1645a9ab40edc5e25b0f7584bc /Documentation/merge-strategies.txt
parentgit-svn: Make create-ignore use git add -f (diff)
downloadtgif-da060c67ae5653e5bc59196ff3dbedb7f8faa594.tar.xz
Documentation: Add create-ignore to git svn manual
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions