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

[PATCH 0/2] add support for ExamDiff

From
Jacob Nisnevich <jacob.nisnevich@gmail.com>
Date
Mar 25, 2016, 22:52 UTC
Message-ID
<1458946376-30296-1-git-send-email-jacob.nisnevich@gmail.com>
In-Reply-To
<xmqq60wbc24h.fsf@gitster.mtv.corp.google.com>

I implemented all the changes you suggested and separated the patch into two different patches. Thanks for all the help David.

Jacob Nisnevich (2):
  mergetools: create mergetool_find_win32_cmd() helper function for
    winmerge
  mergetools: add support for ExamDiff
 git-mergetool--lib.sh | 25 +++++++++++++++++++++++++
 mergetools/examdiff   | 18 ++++++++++++++++++
 mergetools/winmerge   | 21 +--------------------
 3 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 mergetools/examdiff
-- 
1.9.1
Previous: Junio C HamanoNext: Jacob Nisnevich
Message 12 of 20 in “mergetools: created new mergetool file for ExamDiff”
  1. mergetools: created new mergetool file for ExamDiffJacob Nisnevich, Mar 20, 2016
  2. Junio C HamanoMar 21, 2016
  3. David AguilarMar 21, 2016
  4. 0/2 Helper function for ExamDiff and Winmerge mergetoolsJacob Nisnevich, Mar 23, 2016
  5. 1/2 mergetools: created new mergetool file for ExamDiffJacob Nisnevich, Mar 23, 2016
  6. 2/2 created helper function for both winmerge and examdiff mergetoolsJacob Nisnevich, Mar 23, 2016
  7. Junio C HamanoMar 23, 2016
  8. mergetools: implemented new mergetool file for ExamDiffJacob Nisnevich, Mar 23, 2016
  9. mergetools: implemented new mergetool file for ExamDiffJacob Nisnevich, Mar 23, 2016
  10. David AguilarMar 24, 2016
  11. Junio C HamanoMar 24, 2016
  12. 0/2 add support for ExamDiffJacob Nisnevich, Mar 25, 2016
  13. 1/2 mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich, Mar 25, 2016
  14. Junio C HamanoMar 25, 2016
  15. 0/2 mergetools: add support for ExamDiffJacob Nisnevich, Mar 25, 2016
  16. 1/2 mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich, Mar 25, 2016
  17. 2/2 mergetools: add support for ExamDiffJacob Nisnevich, Mar 25, 2016
  18. Junio C HamanoApr 1, 2016
  19. David AguilarApr 2, 2016
  20. 2/2 mergetools: add support for ExamDiffJacob Nisnevich, Mar 25, 2016

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.