D 2010-05-04T11:29:24 J +comment \n\n
drh\sadded\son\s2010-05-04\s11:29:24:
\nAfter\sa\smerge,\syou\sneed\sto\scommit\sthe\sentire\stree,\snot\sindividual\sfiles.\r\n\r\n
\r\nfossil\scommit\r\n
\r\n\r\nNot\r\n\r\n
\r\nfossil\scommit\ssomefile.txt\r\n
J resolution Not_A_Bug J status Closed K fba687385ffa1096b1a4622dbaddf4b6e693adb9 U drh Z 83889453e057015f4e903f0b2ab38345