Victor Stinner <victor.stin...@haypocalc.com> wrote: > Because a merge is a new commit, I suppose that I can do something to > get my local changes back. But, well, I just prefer the "legacy" (?) > merge flavor: > > <<<< local > ... > === > ... > >>> other > > It's easier for my brain because I just have 2 versions of the same > code, not 3!
I also prefer /usr/bin/merge and I've never quite figured out the GUI. Not that I spent a lot of time on it, since the "legacy" merge works well (and is self-explanatory). Stefan Krah _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
