When a merge does not work automatically, git prevents
[safe/jmp/linux-2.6] / Documentation / Changes
2005-05-01 Martin Waitz[PATCH] DocBook: Use xmlto to process the DocBook files.
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2