.\" pacify man page
.TH man 1 "18 April 2009" "0.1" "pacify man page"
.SH NAME
pacify - resolve conflicts in files
.SH SYNOPSIS
.B pacify 1|2 [file ...]
.SH DESCRIPTION
.B pacify
resolves conflicts in files, either by keeping the first part of the conflict, and discarding the second, or vice versa. It modifies files in-place.
.SH EXAMPLES
.PP
pacify 1 arcs.c
.PP
conflicted | xargs --no-run-if-empty pacify 2
.SH AUTHORS
.nf
Sam Watkins (swatkins@fastmail.fm)
.fi
.SH "SEE ALSO"
.BR conflicted
.BR arcs
.BR git