What's the simplest way to git conflicted files?

Posted by inger on Stack Overflow See other posts from Stack Overflow or by inger
Published on 2010-06-17T21:08:52Z Indexed on 2010/06/17 21:13 UTC
Read the original article Hit count: 154

Filed under:
|
|

I just need a plain list of conflicted files.

Is there anything simpler than:

git ls-files -u | cut -f 2 | sort | uniq

or

git ls-files -u | awk '{print $4}' | sort | uniq

?

© Stack Overflow or respective owner

Related posts about git

Related posts about merge