CODEWITHSUNDEEP
linuxmercurialdiff3
Ben
Ben

Reputation: 62364

Using diff3 on a mercurial merge via command line

I'm sitting at a screen split in 3 in Putty showing my files. I can't figure out what I need to Google in order to find documentation on how to navigate the command line UI for KDIFF3. I'm trying to figure out how to go line by line or conflict by conflict or take a whole file altogether. Can you guys help me find a manual or tell me how I can navigate this GUI?

Thanks

Upvotes: 0

Views: 227

Answers (1)

Ry4an Brase
Ry4an Brase

Reputation: 78330

What do you mean the "command line UI for kdiff3". Kdiff3 is a GUI application with an easily found usermanual. Are you sure you're not looking at vimdiff or something else?

Upvotes: 1

Related Questions