I know many people who like p4merge and have used it as their mergetool in git

		chrisweekly on March 3, 2025 \| parent \| context \| favorite \| on: I struggled with Git, so I'm making a game to spar... I know many people who like p4merge and have used it as their mergetool in git