On Sat, Nov 07, 2009 at 06:25:12PM +0100, Marco Ciampa wrote: [...] > # Changed but not updated: > # (use "git add <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > # directory) > # > # unmerged: po/de/concepts.po > # > > > stuck again! :-( > Unpanic-ed...resolved with git reset ok now I'll go on updating...thank you to all... -- Marco Ciampa +--------------------+ | Linux User #78271 | | FSFE fellow #364 | +--------------------+ _______________________________________________ Gimp-docs mailing list Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
