From 00e917dcb4f8adf9210bfec02ac1aaa49f9f0382 Mon Sep 17 00:00:00 2001
From: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
Date: Tue, 5 Aug 2008 11:18:27 -0400
Subject: [PATCH] cmd_unstage: don't mark conflicting files as resolved

---
 yap/yap.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/yap/yap.py b/yap/yap.py
index b1afd79..60b9ec8 100644
--- a/yap/yap.py
+++ b/yap/yap.py
@@ -497,9 +497,7 @@ flag can be used to unstage all staged changes at once.
         "[-a] | <file>..."
         self._check_git()
         if '-a' in flags:
-	    self._unstage_all()
-            self.cmd_status()
-            return
+	    files = self._get_staged_files()
 
         if not files:
             raise TypeError
-- 
2.11.4.GIT