Code

Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:34:05 +0000 (22:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:34:05 +0000 (22:34 -0700)
commit6abf189506712a0e3c5ea796d136177b8f24ca22
tree1a1285d27f5e2c7a360577982ffb9dba437ab5b4
parent20bd3b072f93a8a8a4151a08513cfc3622ac963d
parent5070b49e529e2df30ec2e33073267d281450dde6
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  builtin-fast-export: Only output a single parent per line
builtin-fast-export.c