aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 09:39:40 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-26 09:39:40 -0700
commit7eacaeffd7c2cda1a50a643a7c0c144fea01c76f (patch)
treeb5e7f0972af929d620cf2fea2c14619d549f1a43 /merge-file.c
parent63c11eb4ed677e659bfc0f58026671cf8ce45da9 (diff)
parentfd91d260f2b1aeface2369a758d5b6a142bd9691 (diff)
downloadgit-7eacaeffd7c2cda1a50a643a7c0c144fea01c76f.tar.gz
git-7eacaeffd7c2cda1a50a643a7c0c144fea01c76f.tar.xz
Merge branch 'ss/doc-svn' into maint
* ss/doc-svn: remove noise and inaccuracies from git-svn docs
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions