Andrew's git / gitweb.git / diff
?
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)
* 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

No differences found