Johannes Schindelin wrote: > On Fri, 7 Mar 2008, Jakub Narebski wrote: >> Dnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał: >>> On Fri, 7 Mar 2008, Jakub Narebski wrote: >>> >>>> What do you think about adding "merge" subcommand to git-gui, >>>> or to be more exact adding tree-level merge and/or file-level >>>> merge tool to git-gui? I think we could "borrow" some code from >>>> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL) >>> >>> Is there any reason not to use mergetool? [...] >> Besides "git gui merge" can be more Git-aware than for example TkDiff >> invoked from git-mergetool. It can offer also resolution also to tree >> level conflicts, such as rename/rename, rename/delete and rename/add, >> delete/modify or for example the case when one side has file in >> subdirectory, and other has file in submodule. > > Sure, go ahead. Could you recommend some good (best if also free) documentation of Tcl/Tk, so I won't be doing "cargo cult" (copy'n'paste) programming? -- Jakub Narebski Poland -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
