merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / Makefile
2005-04-07 Initial revision of "git", the information manager...