On 10/27/2019 08:16 PM, Martok wrote: > Am 27.10.2019 um 17:48 schrieb Florian Klämpfl: >>> I guess the main difference is whether one prefers side-by-side >>> diffs or udiffs. >> >> In particular partial commits as well as conflict resolution work much >> better with TortoiseGit for me. > > Oh yeah, conflict resolution is the thing nobody really gets right, but TGit > is > a bit less wrong. > I've pretty much resigned myself to Ctrl-F ">>>>>"...
Have you tried meld? Works for me in combination with git gui -- Ewald _______________________________________________ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
