Migrated from home v23

diff --git a/Home.textile b/Home.textile
index b171b7e7f3d53239c7893d719ac3b97eddae0885..8203017501bbd747df274d1fd9f323c848516e4b 100644 (file)
--- a/Home.textile
+++ b/Home.textile
@@ -11,7 +11,7 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch
 * Let checkout, checkout-index, read-tree & reset work recursively on submodules (in progress)
 * Let fetch run recursively on submodules (in progress)
 * git gui: Add submodule menu for adding and fetching submodules
-* Better support for merging and resolving merge conflicts of submodules
+* Better support for merging and resolving merge conflicts of submodules (Heiko Voigt is working on that)
 * Add means to specify which submodules shall be populated on clone
 * Add an "always-tip" mode