summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-06-20 21:46:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-20 21:46:38 -0700
commit09236d80480c15f6da804e56a80c08d320475fb1 (patch)
treefcffb58dc5dc9ae53e93f4f28357f8a15cb43da4 /Documentation/git-merge-tree.txt
parentMerge branch 'lt/maint-unsigned-left-shift' (diff)
parentadd: allow configurations to be overriden by command line (diff)
downloadtgif-09236d80480c15f6da804e56a80c08d320475fb1.tar.xz
Merge branch 'sb/maint-1.6.0-add-config-fix'
* sb/maint-1.6.0-add-config-fix: add: allow configurations to be overriden by command line use xstrdup, not strdup in ll-merge.c Conflicts: builtin-add.c
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions