Git: conflicts alias.

docs/Git.md

@@ -48,6 +48,10 @@ Add all staged files to previous commit.
 
 Undo last commit withould loosing any changes.
 
+### git conflicts
+
+List of files with unresolved conflicts.
+
 ### gr
 
 Jump to root folder of Git repo.

tilde/gitconfig

@@ -31,6 +31,7 @@
 	this = !git init && git add . && git commit -m \"Initial commit.\"
 	append = !git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend
 	undo = reset --mixed HEAD^
+	conflicts = !git ls-files -u | awk '{print $4}' | sort -u
 [push]
 	default = current