git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Conflict markers in mergetool $LOCAL ?

From
Jacob Helwig <jacob.helwig@gmail.com>
Date
Aug 17, 2010, 18:00 UTC
Message-ID
<f595ee73-b1a3-4797-bf55-20c0f1b309e0@email.android.com>
In-Reply-To
<loom.20100817T185804-167@post.gmane.org>
That actually looks exactly like it should.  The order of the windows that vimdiff uses is (IIRC): ours, on-disk file, theirs.
"Seth House" <seth@eseth.com> wrote:
Show 11 quoted lines
>David Aguilar <davvid <at> gmail.com> writes:
>> What happens if you remove this section?:
>
>Same result. The conflict markers are still there:
>
>http://i.imgur.com/d1vp1.png
>
>--
>To unsubscribe from this list: send the line "unsubscribe git" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: Seth HouseNext: Seth House
Message 5 of 8 in “Conflict markers in mergetool $LOCAL ?”
  1. Seth HouseAug 17, 2010
  2. David AguilarAug 17, 2010
  3. David AguilarAug 17, 2010
  4. Seth HouseAug 17, 2010
  5. Jacob HelwigAug 17, 2010
  6. Seth HouseAug 17, 2010
  7. Charles BaileyAug 17, 2010
  8. Seth HouseAug 18, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.