Because I was confusing “ours” and “their”. On Tue, Mar 20, 2012 at 14:57, Richard Hipp <d...@sqlite.org> wrote: > > > On Tue, Mar 20, 2012 at 9:54 AM, Benoit Mortgat <mort...@gmail.com> wrote: >> >> The simplest way to let merge conflicts happen, and >> restore versions from an older commit if you know the file artifact ids: >> >> fossil artifact a59bd2322 > my/file.txt > > > Why not just "fossil revert my/file.txt"? >
-- Benoit Mortgat _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
