On Thu, 2005-07-07 at 21:17 +0200, Peter Osterlund wrote: > I've found an unrelated problem. If I export patches with "stg export > dirname", there are no diffs included in the patches. The patch > description is all that is generated. If I omit the dirname parameter, > the export works correctly though.
OK, thanks. Fixed in the today's snapshot. I also added a 'resolved' command to mark a solved conflict. 'stg status' also shows the conflicts and 'refresh', 'push', 'pop' fail if there are unresolved conflicts. You can override this by setting 'autoresolved: yes' in the stgitrc file and a 'refresh' command marks all the conflicts as solved automatically (I still need to find some time to write a tutorial for StGIT). Catalin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
