From ab3cb53a007cd0d8900e703a02a36e95c1edbe59 Mon Sep 17 00:00:00 2001
From: Artem Sapegin <artem@sapegin.ru>
Date: Thu, 13 Dec 2012 16:27:12 +0400
Subject: [PATCH] Git: conflicts alias.

---
 docs/Git.md     | 4 ++++
 tilde/gitconfig | 1 +
 2 files changed, 5 insertions(+)

diff --git a/docs/Git.md b/docs/Git.md
index d31c639..73d94ff 100644
--- a/docs/Git.md
+++ b/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.
diff --git a/tilde/gitconfig b/tilde/gitconfig
index 11c2458..7ba00cc 100644
--- a/tilde/gitconfig
+++ b/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