vcs-svn / LICENSEon commit builtin/merge.c: drop a parameter that is never used (08e3ce5)
   1Copyright (C) 2010 David Barr <david.barr@cordelta.com>.
   2All rights reserved.
   3
   4Copyright (C) 2010 Jonathan Nieder <jrnieder@gmail.com>.
   5
   6Copyright (C) 2005 Stefan Hegny, hydrografix Consulting GmbH,
   7Frankfurt/Main, Germany
   8and others, see http://svn2cc.sarovar.org
   9
  10Redistribution and use in source and binary forms, with or without
  11modification, are permitted provided that the following conditions
  12are met:
  131. Redistributions of source code must retain the above copyright
  14   notice(s), this list of conditions and the following disclaimer
  15   unmodified other than the allowable addition of one or more
  16   copyright notices.
  172. Redistributions in binary form must reproduce the above copyright
  18   notice(s), this list of conditions and the following disclaimer in
  19   the documentation and/or other materials provided with the
  20   distribution.
  21
  22THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
  23EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  24IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  25PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
  26LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  27CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  28SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
  29BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  30WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  31OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  32EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.