On Wed, 3 Sep 2014 07:40:35 -0700 (PDT) Volker Braun <vbraun.n...@gmail.com> wrote:
... > On the commandline you can do ... > git diff > develop...trac/u/vinceknight/game_theory__build_capacity_to_solve_matching_games_in_to_sage_ You can also let cgit do this, by crafting the appropriate url [1]. The diff is huge though, so instead you might peek at the ticket's VERSION.txt using a different crafted url [2] or some clicking around in the web interface. In this case you will see that the patch series is based on 6.3.beta5. Crafting another url you can diff with that version [3]. This is not very GUI-y though... Moreover the merge conflicts will still have to be fixed. This view might help with doing the merge though. Regards, Erik Massop [1] http://git.sagemath.org/sage.git/diff/?id2=develop&id=u/vinceknight/game_theory__build_capacity_to_solve_matching_games_in_to_sage_ [2] http://git.sagemath.org/sage.git/tree/VERSION.txt?id=u/vinceknight/game_theory__build_capacity_to_solve_matching_games_in_to_sage_ [3] http://git.sagemath.org/sage.git/diff/?id2=6.3.beta5&id=u/vinceknight/game_theory__build_capacity_to_solve_matching_games_in_to_sage_ -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
