From 9785c5a1c98f6730a2b5947645c72357973078bd Mon Sep 17 00:00:00 2001
From: Marius Vollmer <marius.vollmer@uni-dortmund.de>
Date: Thu, 11 Sep 2008 01:25:01 +0300
Subject: [PATCH] Updated TODO.

---
 magit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/magit.el b/magit.el
index 2b888d9a..55ad9979 100644
--- a/magit.el
+++ b/magit.el
@@ -35,7 +35,7 @@
 ;;; TODO
 
 ;; - Equivalent of interactive rebase
-;;   - rewrite finishing
+;;   - replaying merges
 ;; - Handle renames.
 ;; - Visiting from staged hunks doesn't always work since the line
 ;;   numbers don't refer to the working tree.  Fix that somehow.