From: Seth House <seth@eseth.com> To: git@vger.kernel.org Cc: Seth House <seth@eseth.com>, pudinha <rogi@skylittlesystem.org>, David Aguilar <davvid@gmail.com>, Junio C Hamano <gitster@pobox.com> Subject: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant Date: Sat, 13 Feb 2021 19:28:39 -0700 Message-ID: <20210214022840.849312-1-seth@eseth.com> (raw) Add yet another vimdiff layout variant to present the simplest possible two-way diff when resolving conflicts. The name is an attempt at UNIX-style humor -- vimdiff3 opens four buffers and vimdiff2 opens three buffers so vimdiff1 should therefore open two buffers. It also communicates that vimdiff will be used and fits cleanly into the existing layout variant naming. That said, suggestions welcome if that isn't as great a fit as I think it is. :) Seth House (1): mergetools/vimdiff: add vimdiff1 merge tool variant mergetools/vimdiff | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.29.2
next reply index Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-14 2:28 Seth House [this message] 2021-02-14 2:28 ` [PATCH 1/1] " Seth House 2021-02-16 18:38 ` Junio C Hamano 2021-02-23 18:55 ` David Aguilar 2021-02-25 16:02 ` Seth House 2021-02-25 18:45 ` [PATCH 0/1] " Philippe Blain 2021-02-26 0:29 ` Seth House 2021-02-26 2:04 ` Junio C Hamano 2021-02-26 23:35 ` Seth House 2021-02-27 1:52 ` Junio C Hamano 2021-02-27 2:17 ` Seth House
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210214022840.849312-1-seth@eseth.com \ --to=seth@eseth.com \ --cc=davvid@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=rogi@skylittlesystem.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Mailing List Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/git/0 git/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 git git/ https://lore.kernel.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git