man(1) conflicted man page man(1) NNAAMMEE conflicted - list files having conflicts in them SSYYNNOOPPSSIISS ccoonnfflliicctteedd [[ddiirr ......]] DDEESSCCRRIIPPTTIIOONN ccoonnfflliicctteedd 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 ggiitt which I think is the same as that used by other version control systems. You can use ppaacciiffyy to resolve the con‐ flict. AAUUTTHHOORRSS Sam Watkins (swatkins@fastmail.fm) SSEEEE AALLSSOO ppaacciiffyy aarrccss ggiitt 0.1 18 April 2009 man(1)