git-conflicted

lists unmerged (confilcting) files

A simple listing of all your un-merged files that have conflicts in them.

(see also git-add-conflicted)

Usage

USAGE: git conflicted
       Lists unmerged (conflicting) files.

Metadata:

Tags:

  • git
  • merge