Add the simple scripts I used to do a merge with content conflicts.
[gitweb.git] / COPYING
2005-04-11 Add a COPYING notice, making it explicit that the licen...