On 28 June 2015 at 18:31, Louis Popi <[email protected]> wrote: > Anyway, I feel like I annoy you with this bug wich I seems to be the only one > facing it. I typed the command you gave me earlier and the command lines were > fine.
I'm sorry if I came across as annoyed. I didn't mean to. I was just confused about the problem. > So I simply decided to disable the use of "--outpout" on git (using 'git > config --global meld.hasOutput false' or 'git config --global > mergetool.meld.hasOutput false') and now everything works perfectly. > Maybe that's related to my graphics card proprietary drivers (Nvidia), I > don't know. If disabling the use of --output does what you want, then the problem is just that Git's default mergetool configuration changed. Git used to run "meld $LOCAL $MERGED $REMOTE", which gave you the local and remote files in the side panes, and in the middle it gave you the pre-merged file with conflict markers. More recently, they changed to run "meld $LOCAL $BASE $REMOTE --output $MERGED", which gives you the same side panes, but the middle pane is now the common ancestor of the two revisions you're merging, with the output going to the normal file on disk. This is why you're not seeing conflict markers; Git relies on Meld to show you which sections are conflicting (which I hope we do, just not with markers). There's an open bug report (https://bugzilla.gnome.org/show_bug.cgi?id=699033) about showing a mostly-auto-merged file with BASE where conflicts arise, which might be more like what you want. This even seems to work pretty well and I just haven't gotten around to testing it more thoroughly and thinking it through. cheers, Kai _______________________________________________ meld-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/meld-list
