{"thread":{"id":"25106","subject":"[PATCH 1/2] mergetool-lib: combine vimdiff and gvimdiff run blocks","startedAt":"2010-09-15T02:21:42Z","lastAt":"2010-09-27T15:19:09Z","messageCount":10,"participants":["Dan McGee","David Aguilar","Felipe Contreras","Jacob Helwig","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"150721","messageId":"1284517303-17244-1-git-send-email-dpmcgee@gmail.com","threadId":"25106","inReplyTo":null,"subject":"[PATCH 1/2] mergetool-lib: combine vimdiff and gvimdiff run blocks","fromName":"Dan McGee","fromEmail":"dpmcgee@gmail.com","sentAt":"2010-09-15T02:21:42Z","receivedAt":"2010-09-15T02:21:42Z","isPatch":true,"sender":{"key":"dpmcgee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/265817?v=4"},"body":"They are nearly identical outside of the foreground flag, which can safely\nbe passed to both vim and gvim. The merge tool itself is named in\n$merge_tool_path.\n\nSigned-off-by: Dan McGee <dpmcgee@gmail.com>\n---\n git-mergetool--lib.sh |   17 +++--------------\n 1 files changed, 3 insertions(+), 14 deletions(-)\n\ndiff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh\nindex b5e1943..f9a51ba 100644\n--- a/git-mergetool--lib.sh\n+++ b/git-mergetool--lib.sh\n@@ -169,25 +169,14 @@ run_merge_tool () {\n \t\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" | cat\n \t\tfi\n \t\t;;\n-\tvimdiff)\n-\t\tif merge_mode; then\n-\t\t\ttouch \"$BACKUP\"\n-\t\t\t\"$merge_tool_path\" -d -c \"wincmd l\" \\\n-\t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n-\t\t\tcheck_unchanged\n-\t\telse\n-\t\t\t\"$merge_tool_path\" -d -c \"wincmd l\" \\\n-\t\t\t\t\"$LOCAL\" \"$REMOTE\"\n-\t\tfi\n-\t\t;;\n-\tgvimdiff)\n+\tvimdiff|gvimdiff)\n \t\tif merge_mode; then\n \t\t\ttouch \"$BACKUP\"\n-\t\t\t\"$merge_tool_path\" -d -c \"wincmd l\" -f \\\n+\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n \t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n \t\t\tcheck_unchanged\n \t\telse\n-\t\t\t\"$merge_tool_path\" -d -c \"wincmd l\" -f \\\n+\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n \t\t\t\t\"$LOCAL\" \"$REMOTE\"\n \t\tfi\n \t\t;;\n-- \n1.7.2.3\n"},{"id":"150722","messageId":"1284517303-17244-2-git-send-email-dpmcgee@gmail.com","threadId":"25106","inReplyTo":"1284517303-17244-1-git-send-email-dpmcgee@gmail.com","subject":"[PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"Dan McGee","fromEmail":"dpmcgee@gmail.com","sentAt":"2010-09-15T02:21:43Z","receivedAt":"2010-09-15T02:21:43Z","isPatch":true,"sender":{"key":"dpmcgee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/265817?v=4"},"body":"When the base version is available, use a three-way, four panel view by\ndefault. This shows the (local, base, remote) revisions up top and the\nmerged result by itself in the lower pane. All revisions will still scroll\ntogether by default, and the cursor still defaults to the merged result edit\npane.\n\nSigned-off-by: Dan McGee <dpmcgee@gmail.com>\n---\n\nVim was one of the few diff commands to not support a three-way merge showing\nthe base revision, so this is a stab at resolving that shortfall. The biggest\nobjection I can see to this is making the interface a bit more cumbersome and\nbloated.\n\nAn example screenshot of what this produces:\nhttp://www.toofishes.net/media/extra/vim_three_way.png\n\n-Dan\n\n git-mergetool--lib.sh |    9 +++++++--\n 1 files changed, 7 insertions(+), 2 deletions(-)\n\ndiff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh\nindex f9a51ba..b84ac58 100644\n--- a/git-mergetool--lib.sh\n+++ b/git-mergetool--lib.sh\n@@ -172,8 +172,13 @@ run_merge_tool () {\n \tvimdiff|gvimdiff)\n \t\tif merge_mode; then\n \t\t\ttouch \"$BACKUP\"\n-\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n-\t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n+\t\t\tif $base_present; then\n+\t\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd J\" \\\n+\t\t\t\t\t\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"\n+\t\t\telse\n+\t\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n+\t\t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n+\t\t\tfi\n \t\t\tcheck_unchanged\n \t\telse\n \t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n-- \n1.7.2.3\n"},{"id":"150928","messageId":"20100918073428.GA9850@gmail.com","threadId":"25106","inReplyTo":"1284517303-17244-2-git-send-email-dpmcgee@gmail.com","subject":"Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2010-09-18T07:34:30Z","receivedAt":"2010-09-18T07:34:30Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Tue, Sep 14, 2010 at 09:21:43PM -0500, Dan McGee wrote:\n> When the base version is available, use a three-way, four panel view by\n> default. This shows the (local, base, remote) revisions up top and the\n> merged result by itself in the lower pane. All revisions will still scroll\n> together by default, and the cursor still defaults to the merged result edit\n> pane.\n> \n> Signed-off-by: Dan McGee <dpmcgee@gmail.com>\n> ---\n> \n> Vim was one of the few diff commands to not support a three-way merge showing\n> the base revision, so this is a stab at resolving that shortfall. The biggest\n> objection I can see to this is making the interface a bit more cumbersome and\n> bloated.\n> \n> An example screenshot of what this produces:\n> http://www.toofishes.net/media/extra/vim_three_way.png\n> \n> -Dan\n\n\nPatch 1/2 of this series looks good to me.\n\nIs it worth keeping the old behavior and calling this new\nmode \"vimdiff3\" or something along those lines?\n\nI'm not a vimdiff user so I'm not be the best person to\njudge the merits of this change.  I like what it's trying\nto accomplish, though.  Are there any vimdiff users\nwith strong feelings either way?\n\n-- \n\n\t\tDavid\n"},{"id":"150982","messageId":"AANLkTim_hwduHk-ENM73dwHUj9XbwfihZPRfsHX+M3DE@mail.gmail.com","threadId":"25106","inReplyTo":"20100918073428.GA9850@gmail.com","subject":"Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2010-09-19T09:48:48Z","receivedAt":"2010-09-19T09:48:48Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sat, Sep 18, 2010 at 10:34 AM, David Aguilar <davvid@gmail.com> wrote:\n> On Tue, Sep 14, 2010 at 09:21:43PM -0500, Dan McGee wrote:\n>> When the base version is available, use a three-way, four panel view by\n>> default. This shows the (local, base, remote) revisions up top and the\n>> merged result by itself in the lower pane. All revisions will still scroll\n>> together by default, and the cursor still defaults to the merged result edit\n>> pane.\n>>\n>> Signed-off-by: Dan McGee <dpmcgee@gmail.com>\n>> ---\n>>\n>> Vim was one of the few diff commands to not support a three-way merge showing\n>> the base revision, so this is a stab at resolving that shortfall. The biggest\n>> objection I can see to this is making the interface a bit more cumbersome and\n>> bloated.\n>>\n>> An example screenshot of what this produces:\n>> http://www.toofishes.net/media/extra/vim_three_way.png\n>>\n>> -Dan\n>\n>\n> Patch 1/2 of this series looks good to me.\n>\n> Is it worth keeping the old behavior and calling this new\n> mode \"vimdiff3\" or something along those lines?\n>\n> I'm not a vimdiff user so I'm not be the best person to\n> judge the merits of this change.  I like what it's trying\n> to accomplish, though.  Are there any vimdiff users\n> with strong feelings either way?\n\nI think this is a definite improvement; the old mode wasn't really\nuseful for me.\n\n-- \nFelipe Contreras\n"},{"id":"151526","messageId":"AANLkTin-BSAFwvuTyJ96BW6MqrKVEni+Af2M0u7WE_yZ@mail.gmail.com","threadId":"25106","inReplyTo":"AANLkTim_hwduHk-ENM73dwHUj9XbwfihZPRfsHX+M3DE@mail.gmail.com","subject":"Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"Dan McGee","fromEmail":"dpmcgee@gmail.com","sentAt":"2010-09-24T19:01:01Z","receivedAt":"2010-09-24T19:01:01Z","isPatch":true,"sender":{"key":"dpmcgee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/265817?v=4"},"body":"On Sun, Sep 19, 2010 at 4:48 AM, Felipe Contreras\n<felipe.contreras@gmail.com> wrote:\n> On Sat, Sep 18, 2010 at 10:34 AM, David Aguilar <davvid@gmail.com> wrote:\n>> On Tue, Sep 14, 2010 at 09:21:43PM -0500, Dan McGee wrote:\n>>> When the base version is available, use a three-way, four panel view by\n>>> default. This shows the (local, base, remote) revisions up top and the\n>>> merged result by itself in the lower pane. All revisions will still scroll\n>>> together by default, and the cursor still defaults to the merged result edit\n>>> pane.\n>>>\n>>> Signed-off-by: Dan McGee <dpmcgee@gmail.com>\n>>> ---\n>>>\n>>> Vim was one of the few diff commands to not support a three-way merge showing\n>>> the base revision, so this is a stab at resolving that shortfall. The biggest\n>>> objection I can see to this is making the interface a bit more cumbersome and\n>>> bloated.\n>>>\n>>> An example screenshot of what this produces:\n>>> http://www.toofishes.net/media/extra/vim_three_way.png\n>>>\n>>> -Dan\n>>\n>>\n>> Patch 1/2 of this series looks good to me.\n>>\n>> Is it worth keeping the old behavior and calling this new\n>> mode \"vimdiff3\" or something along those lines?\n>>\n>> I'm not a vimdiff user so I'm not be the best person to\n>> judge the merits of this change.  I like what it's trying\n>> to accomplish, though.  Are there any vimdiff users\n>> with strong feelings either way?\n>\n> I think this is a definite improvement; the old mode wasn't really\n> useful for me.\n\nNot as much feedback as I had hoped, but thanks to those that did\nspeak up. I was thinking of adding a separate mode, but I think it\nwould then get under-used and as I said, every other merge tool was\nalready doing this anyway.\n\nSo are these patches good to go forward with? No major objections in a\nover a week's time.\n\n-Dan\n"},{"id":"151528","messageId":"20100924190928.GC3768@vfa-6z.perlninja.com","threadId":"25106","inReplyTo":"AANLkTin-BSAFwvuTyJ96BW6MqrKVEni+Af2M0u7WE_yZ@mail.gmail.com","subject":"Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"Jacob Helwig","fromEmail":"jacob.helwig@gmail.com","sentAt":"2010-09-24T19:09:28Z","receivedAt":"2010-09-24T19:09:28Z","isPatch":true,"sender":{"key":"jacob.helwig@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14557?v=4"},"body":"On Fri, 24 Sep 2010 14:01:01 -0500, Dan McGee wrote:\n> \n> On Sun, Sep 19, 2010 at 4:48 AM, Felipe Contreras\n> <felipe.contreras@gmail.com> wrote:\n> > On Sat, Sep 18, 2010 at 10:34 AM, David Aguilar <davvid@gmail.com> wrote:\n> >> On Tue, Sep 14, 2010 at 09:21:43PM -0500, Dan McGee wrote:\n> >>> When the base version is available, use a three-way, four panel view by\n> >>> default. This shows the (local, base, remote) revisions up top and the\n> >>> merged result by itself in the lower pane. All revisions will still scroll\n> >>> together by default, and the cursor still defaults to the merged result edit\n> >>> pane.\n> >>>\n> >>> Signed-off-by: Dan McGee <dpmcgee@gmail.com>\n> >>> ---\n> >>>\n> >>> Vim was one of the few diff commands to not support a three-way merge showing\n> >>> the base revision, so this is a stab at resolving that shortfall. The biggest\n> >>> objection I can see to this is making the interface a bit more cumbersome and\n> >>> bloated.\n> >>>\n> >>> An example screenshot of what this produces:\n> >>> http://www.toofishes.net/media/extra/vim_three_way.png\n> >>>\n> >>> -Dan\n> >>\n> >>\n> >> Patch 1/2 of this series looks good to me.\n> >>\n> >> Is it worth keeping the old behavior and calling this new\n> >> mode \"vimdiff3\" or something along those lines?\n> >>\n> >> I'm not a vimdiff user so I'm not be the best person to\n> >> judge the merits of this change.  I like what it's trying\n> >> to accomplish, though.  Are there any vimdiff users\n> >> with strong feelings either way?\n> >\n> > I think this is a definite improvement; the old mode wasn't really\n> > useful for me.\n> \n> Not as much feedback as I had hoped, but thanks to those that did\n> speak up. I was thinking of adding a separate mode, but I think it\n> would then get under-used and as I said, every other merge tool was\n> already doing this anyway.\n> \n> So are these patches good to go forward with? No major objections in a\n> over a week's time.\n> \n> -Dan\n\nI'd +1 David's suggestion of calling this \"vimdiff3\", I'd like to still\nbe able to access the current behavior, since I have merge.conflictstyle\n= diff3, and already see the merge base when I use (g)vimdiff with\nmergetool.\n\n-- \nJacob Helwig\n"},{"id":"151552","messageId":"20100924213116.GA19676@sigill.intra.peff.net","threadId":"25106","inReplyTo":"AANLkTin-BSAFwvuTyJ96BW6MqrKVEni+Af2M0u7WE_yZ@mail.gmail.com","subject":"Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-09-24T21:31:17Z","receivedAt":"2010-09-24T21:31:17Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Sep 24, 2010 at 02:01:01PM -0500, Dan McGee wrote:\n\n> On Sun, Sep 19, 2010 at 4:48 AM, Felipe Contreras\n> <felipe.contreras@gmail.com> wrote:\n> > On Sat, Sep 18, 2010 at 10:34 AM, David Aguilar <davvid@gmail.com> wrote:\n> >> On Tue, Sep 14, 2010 at 09:21:43PM -0500, Dan McGee wrote:\n> >>> When the base version is available, use a three-way, four panel view by\n> >>> default. This shows the (local, base, remote) revisions up top and the\n> >>> merged result by itself in the lower pane. All revisions will still scroll\n> >>> together by default, and the cursor still defaults to the merged result edit\n> >>> pane.\n> >>>\n> >>> Signed-off-by: Dan McGee <dpmcgee@gmail.com>\n> >>> ---\n> >>>\n> >>> Vim was one of the few diff commands to not support a three-way merge showing\n> >>> the base revision, so this is a stab at resolving that shortfall. The biggest\n> >>> objection I can see to this is making the interface a bit more cumbersome and\n> >>> bloated.\n> >>>\n> >>> An example screenshot of what this produces:\n> >>> http://www.toofishes.net/media/extra/vim_three_way.png\n> >>>\n> >>> -Dan\n> >>\n> >>\n> >> Patch 1/2 of this series looks good to me.\n> >>\n> >> Is it worth keeping the old behavior and calling this new\n> >> mode \"vimdiff3\" or something along those lines?\n> >>\n> >> I'm not a vimdiff user so I'm not be the best person to\n> >> judge the merits of this change.  I like what it's trying\n> >> to accomplish, though.  Are there any vimdiff users\n> >> with strong feelings either way?\n> >\n> > I think this is a definite improvement; the old mode wasn't really\n> > useful for me.\n> \n> Not as much feedback as I had hoped, but thanks to those that did\n> speak up. I was thinking of adding a separate mode, but I think it\n> would then get under-used and as I said, every other merge tool was\n> already doing this anyway.\n\nA little more feedback:\n\nI use vim but don't use vimdiff, because the original mode seemed\nuseless to me. Your change makes it much better. I haven't actually had\nto do any merging lately, though, so I can't comment in practice.\n\nGiven that nobody has objected, you have a few comments in support, and\nthe fact that it makes it similar to every other mergetool driver, I\nthink it should probably be the default. If somebody really finds it\nobjectionable, it is not hard for them to configure the old behavior.\n\n-Peff\n"},{"id":"151554","messageId":"20100924213852.GB19676@sigill.intra.peff.net","threadId":"25106","inReplyTo":"20100924190928.GC3768@vfa-6z.perlninja.com","subject":"Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-09-24T21:38:52Z","receivedAt":"2010-09-24T21:38:52Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Sep 24, 2010 at 12:09:28PM -0700, Jacob Helwig wrote:\n\n> > So are these patches good to go forward with? No major objections in a\n> > over a week's time.\n> > \n> > -Dan\n> \n> I'd +1 David's suggestion of calling this \"vimdiff3\", I'd like to still\n> be able to access the current behavior, since I have merge.conflictstyle\n> = diff3, and already see the merge base when I use (g)vimdiff with\n> mergetool.\n\nOf course as soon as I say \"nobody objected\" in my other email, this\narrives. :)\n\nCan we provide both, but make the vimdiff3 behavior the preferred\ndefault? It better matches the default merge.conflictstyle, and people\nwho are using diff3 obviously understand how to tweak config.\n\n-Peff\n"},{"id":"151600","messageId":"20100925031745.GB30550@gmail.com","threadId":"25106","inReplyTo":"20100924213852.GB19676@sigill.intra.peff.net","subject":"Re: [PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2010-09-25T03:17:47Z","receivedAt":"2010-09-25T03:17:47Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Fri, Sep 24, 2010 at 05:38:52PM -0400, Jeff King wrote:\n> On Fri, Sep 24, 2010 at 12:09:28PM -0700, Jacob Helwig wrote:\n> \n> > > So are these patches good to go forward with? No major objections in a\n> > > over a week's time.\n> > > \n> > > -Dan\n> > \n> > I'd +1 David's suggestion of calling this \"vimdiff3\", I'd like to still\n> > be able to access the current behavior, since I have merge.conflictstyle\n> > = diff3, and already see the merge base when I use (g)vimdiff with\n> > mergetool.\n> \n> Of course as soon as I say \"nobody objected\" in my other email, this\n> arrives. :)\n> \n> Can we provide both, but make the vimdiff3 behavior the preferred\n> default? It better matches the default merge.conflictstyle, and people\n> who are using diff3 obviously understand how to tweak config.\n> \n> -Peff\n\n+1 to Peff's suggestion.\n\nDan, can you reroll the patch so that the new behavior is\n\"(g)vimdiff\" and the old behavior is available as\n\"(g)vimdiff2\"?\n\nI do slightly dislike having both from the maintenance POV.\nBut, it's better to keep it around than to rip it away from\nhappy users' hands.  Thanks for speaking up Jacob.\n\n\nCheers,\n-- \n\n\t\tDavid\n"},{"id":"151829","messageId":"1285600749-1088-1-git-send-email-dpmcgee@gmail.com","threadId":"25106","inReplyTo":"20100925031745.GB30550@gmail.com","subject":"[PATCH 2/2] mergetool-lib: add a three-way diff view for vim/gvim","fromName":"Dan McGee","fromEmail":"dpmcgee@gmail.com","sentAt":"2010-09-27T15:19:09Z","receivedAt":"2010-09-27T15:19:09Z","isPatch":true,"sender":{"key":"dpmcgee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/265817?v=4"},"body":"When the base version is available, use a three-way, four panel view by\ndefault. This shows the (local, base, remote) revisions up top and the\nmerged result by itself in the lower pane. All revisions will still scroll\ntogether by default, and the cursor still defaults to the merged result edit\npane.\n\nThe original vimdiff/gvimdiff configuration is now available by using\n'vimdiff2' or 'gvimdiff2' as the preferred merge tool.\n\nSigned-off-by: Dan McGee <dpmcgee@gmail.com>\n---\n\nThis should address the comments I got once I pestered people. The new behavior\nis the default, but it at least becomes possible to use the previous behavior\nwithout much hassle (just set your mergetool appropriately).\n\n-Dan\n\n git-mergetool--lib.sh |   23 ++++++++++++++++++++---\n 1 files changed, 20 insertions(+), 3 deletions(-)\n\ndiff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh\nindex f9a51ba..77d4aee 100644\n--- a/git-mergetool--lib.sh\n+++ b/git-mergetool--lib.sh\n@@ -10,10 +10,10 @@ merge_mode() {\n \n translate_merge_tool_path () {\n \tcase \"$1\" in\n-\tvimdiff)\n+\tvimdiff|vimdiff2)\n \t\techo vim\n \t\t;;\n-\tgvimdiff)\n+\tgvimdiff|gvimdiff2)\n \t\techo gvim\n \t\t;;\n \temerge)\n@@ -47,7 +47,8 @@ check_unchanged () {\n valid_tool () {\n \tcase \"$1\" in\n \tkdiff3 | tkdiff | xxdiff | meld | opendiff | \\\n-\temerge | vimdiff | gvimdiff | ecmerge | diffuse | araxis | p4merge)\n+\tvimdiff | gvimdiff | vimdiff2 | gvimdiff2 | \\\n+\temerge | ecmerge | diffuse | araxis | p4merge)\n \t\t;; # happy\n \ttortoisemerge)\n \t\tif ! merge_mode; then\n@@ -172,6 +173,22 @@ run_merge_tool () {\n \tvimdiff|gvimdiff)\n \t\tif merge_mode; then\n \t\t\ttouch \"$BACKUP\"\n+\t\t\tif $base_present; then\n+\t\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd J\" \\\n+\t\t\t\t\t\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"\n+\t\t\telse\n+\t\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n+\t\t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n+\t\t\tfi\n+\t\t\tcheck_unchanged\n+\t\telse\n+\t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n+\t\t\t\t\"$LOCAL\" \"$REMOTE\"\n+\t\tfi\n+\t\t;;\n+\tvimdiff2|gvimdiff2)\n+\t\tif merge_mode; then\n+\t\t\ttouch \"$BACKUP\"\n \t\t\t\"$merge_tool_path\" -f -d -c \"wincmd l\" \\\n \t\t\t\t\"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n \t\t\tcheck_unchanged\n-- \n1.7.3\n"}]}