Merge branch 'mh/maint-parse-dirstat-fix' into next
commit852d6093d4bc080e58773003c8680956e99fb663
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:17:16 +0000 (4 08:17 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:17:16 +0000 (4 08:17 -0500)
tree2f85a4ca5b6d80fb7555643a7f99003e13bca27c
parent790337bb8da999d2fd69b7238d2e203b6d89e1f9
parent02e8ca0e50abc15596db1fa93bda29bbd91007a7
Merge branch 'mh/maint-parse-dirstat-fix' into next

Cleans up some code and avoids a potential bug.

* mh/maint-parse-dirstat-fix:
  parse_dirstat_params(): use string_list to split comma-separated string
diff.c