man(1)                                    conflicted man page                                   man(1)



NAME
       conflicted - list files having conflicts in them

SYNOPSIS
       conflicted [dir ...]

DESCRIPTION
       conflicted lists files having conflicts in them. It scans the content of the files for conflict
       markup, it does not query a version control system. It works with the markup used by git  which
       I  think  is  the  same  as  that  used by other version control systems. You can use pacify to
       resolve the conflict.

AUTHORS
       Sam Watkins (swatkins@fastmail.fm)

SEE ALSO
       pacify arcs git



0.1                                          18 April 2009                                      man(1)