[Gnucash-changes] Annotate what broke in the merge.

David Hampton hampton at cvs.gnucash.org
Fri Dec 31 14:38:34 EST 2004


Log Message:
-----------
Annotate what broke in the merge.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        GNOME2_STATUS

Revision Data
-------------
Index: GNOME2_STATUS
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/Attic/GNOME2_STATUS,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -LGNOME2_STATUS -LGNOME2_STATUS -u -r1.1.2.32 -r1.1.2.33
--- GNOME2_STATUS
+++ GNOME2_STATUS
@@ -163,6 +163,12 @@
 |               | - Probably more TODO but these are the main   |            |
 |               |     points.                                   |            |
 ------------------------------------------------------------------------------
+| Hierarchy     | - Doesn't let you complete the conflict       |            |
+| Merge         |     resolution process, thus you can never    |            |
+| BROKEN        |     complete the druid.                       |            |
+------------------------------------------------------------------------------
+|               |                                               |            |
+------------------------------------------------------------------------------
 
 ========================================
               ENHANCEMENTS


More information about the gnucash-changes mailing list