contribmerge

Home > contribmerge

Contribmerge is a project mainly written in C and C++, based on the GPL-2.0, WTFPL licenses found.

Repository for developement of an application to 3-way merge doc/contributions.txt of a Second Life viewer source tree.

A three-way doc/contributions.txt merger.

SYNOPSIS contribmerge ( | [] )

DESCRIPTION contribmerge incorporates all changes that lead from to into . The result ordinarily goes into . contribmerge is useful for combining separate changes to an original. Suppose is the original, and both and are modifications of . Then contribmerge combines both changes.

OPTIONS -p Send results to standard output instead of overwriting file .

   -q     Quiet; do not warn about conflicts.

   -V     Print version number.

DIAGNOSTICS Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.

Previous：Labb6_DVGA09

Next：spicyspot