summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-02 16:13:21 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-02 16:13:21 -0800
commit9b3b7fd8072783e2ec20b3cf622713d39b1c8af4 (patch)
tree1209c952a05939a8b3d5b6bf2c58fbb78ce0ebfe /builtin-merge.c
parentdeb13872becbc5fb49e3ab22dd9feaf4e429a853 (diff)
parent25e30fa08e687d584d9dd87d13acf84bb1e1858c (diff)
downloadgit-9b3b7fd8072783e2ec20b3cf622713d39b1c8af4.tar.gz
Merge branch 'maint'
* maint: User's Manual: remove duplicated url at the end of Appendix B
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions