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

Re: Conflict editing

From
Brian Gernhardt <benji@silverinsanity.com>
Date
Mar 5, 2007, 19:27 UTC
Message-ID
<CFF9D792-A563-408A-8E28-1F045B0952F8@silverinsanity.com>
In-Reply-To
<Pine.LNX.4.63.0703051223420.22628@wbgn013.biozentrum.uni-wuerzburg.de>
On Mar 5, 2007, at 6:25 AM, Johannes Schindelin wrote:
> Alas, vi complained to me by saying "Not started from a terminal", and
> wrecking my terminal settings. For example, echo was set to off, and
> Ctrl+C no longer worked.

Of course. I use "xargs vim" on a semi-regular basis and have forgotten that it mucks up some terms and behaves slightly oddly. It's just one of the little things I deal with on a regular basis and mostly ignore.

> Since I am a nice person, I did not want you to have the same  
> experience
> with this dumb script.

Yes, we should be nice and not screw with people's heads, even if mine is already pretty screwy.

~~ Brian
Previous: Uwe Kleine-König
Message 11 of 11 in “Conflict editing”
  1. Johannes SchindelinMar 4, 2007
  2. Johannes SchindelinMar 4, 2007
  3. Theodore TsoMar 4, 2007
  4. Martin LanghoffMar 4, 2007
  5. Theodore TsoMar 5, 2007
  6. Martin LanghoffMar 5, 2007
  7. Shawn O. PearceMar 4, 2007
  8. Brian GernhardtMar 5, 2007
  9. Johannes SchindelinMar 5, 2007
  10. Uwe Kleine-KönigMar 5, 2007
  11. Brian GernhardtMar 5, 2007

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.