* 3-way diff tool support
@ 2021-11-05 1:38 Austin Stephens
0 siblings, 0 replies; only message in thread
From: Austin Stephens @ 2021-11-05 1:38 UTC (permalink / raw)
To: git
When might you be able to implement this? 3-way merges are doable, but
I was hoping to be able to have my diff tool (Beyond Compare) be able
to receive a 3-way diff from git without having to manually check out
a copy or modify my repository's state.
There are multiple Stack Overflow questions regarding this.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-11-05 1:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-05 1:38 3-way diff tool support Austin Stephens
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).