monotone

monotone Mtn Source Tree

Root/src/diff_output.hh

1// Copyright (C) 2002 Graydon Hoare <graydon@pobox.com>
2// 2008, 2012 Stephen Leake <stephen_leake@stephe-leake.org>
3//
4// This program is made available under the GNU GPL version 2.0 or
5// greater. See the accompanying file COPYING for details.
6//
7// This program is distributed WITHOUT ANY WARRANTY; without even the
8// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
9// PURPOSE.
10
11#ifndef __DIFF_PATCH_HH__
12#define __DIFF_PATCH_HH__
13
14// this file is to contain some stripped down, in-process implementations
15// of GNU-diffutils-like things (diff, diff3, maybe patch..)
16
17#include "vocab.hh"
18
19void make_diff(std::string const & filename1,
20 std::string const & filename2,
21 file_id const & id1,
22 file_id const & id2,
23 data const & data1,
24 data const & data2,
25 bool is_manual_merge,
26 std::ostream & ost,
27 diff_type type,
28 std::string const & pattern);
29
30#endif // __DIFF_PATCH_HH__
31
32// Local Variables:
33// mode: C++
34// fill-column: 76
35// c-file-style: "gnu"
36// indent-tabs-mode: nil
37// End:
38// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:

Archive Download this file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status