git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / RelNotes-1.5.0.1.txt
2007-02-14 Add RelNotes 1.5.0.1