new symbol for unmerged files

goj · Jun 2, 2010 · faf8702 · faf8702
1 parent 4a28afe
commit faf8702
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -33,7 +33,7 @@ The symbols are as follows:
 * Status Symbols
 	:⚡: repository clean
 	:♦n: there are ``n`` staged files
-	:♠n: there are ``n`` unmerged files
+	:≠n: there are ``n`` unmerged files
 	:‣n: there are ``n`` changed but *unstaged* files
 	:…: there are some untracked files
 

diff --git a/gitstatus.py b/gitstatus.py
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 
 # change those symbols to whatever you prefer
-symbols = {'ahead of': '↑', 'behind': '↓', 'staged':'♦', 'changed':'‣', 'untracked':'…', 'clean':'⚡', 'unmerged':'♠', 'sha1':':'}
+symbols = {'ahead of': '↑', 'behind': '↓', 'staged':'♦', 'changed':'‣', 'untracked':'…', 'clean':'⚡', 'unmerged':'≠', 'sha1':':'}
 
 from subprocess import Popen, PIPE