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