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

[PATCH 0/4] Merge test cases

From
Fredrik Kuivinen <freku045@student.liu.se>
Date
Dec 3, 2005, 10:32 UTC
Message-ID
<20051203103255.GA4896@c165.ib.student.liu.se>

This series adds two test cases for merge strategies. The first one test that something sensible is done in case of directory/file conflicts, the second one tests a criss-cross merge.

- Fredrik
Next: Fredrik Kuivinen
Message 1 of 5 in “Merge test cases”
  1. 0/4 Merge test casesFredrik Kuivinen, Dec 3, 2005
  2. 1/4 git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen, Dec 3, 2005
  3. 2/4 test-lib.sh: Add new function, test_expect_codeFredrik Kuivinen, Dec 3, 2005
  4. 3/4 New test case: merge with directory/file conflictsFredrik Kuivinen, Dec 3, 2005
  5. 4/4 New test case: Criss-cross mergeFredrik Kuivinen, Dec 3, 2005

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.