I just need the list of conflicting files.
There is something simpler than:
git ls-files -u | cut -f 2 | sort -u
either
git ls-files -u | awk '{print $4}' | sort | uniq
?
I guess I can manually set an alias for this, however I am wondering the advantages of doing this. I usually write shell loops
for example to auto-resolve conflicts, etc. Perhaps replacing that loop
one by adding it to the mergetool.cmd?
The simplest way to get a list of conflicting files would be:
To configure an Alias:
although you can also add it to the file
~/.gitconfig
To use the Alias, instead of typing:
we only write: