git-resolve-script: stop when the automated merge fails
[gitweb.git] / COPYING
2005-04-11 Add a COPYING notice, making it explicit that the licen...