Code

Merge branch 'sb/maint-1.6.0-add-config-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:46:38 +0000 (21:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:46:38 +0000 (21:46 -0700)
commit09236d80480c15f6da804e56a80c08d320475fb1
treefcffb58dc5dc9ae53e93f4f28357f8a15cb43da4
parent7c74c3926ad60ba1bbfed13355f00a29813a0f32
parented342fdea0b7fd466ed3257c5e68aa81c391b782
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
builtin-add.c
ll-merge.c
t/t3700-add.sh