Originally posted by: cdekok

Wanting to know if there are ways to do diffmerges on AIX using git? Or something equivalent?

Originally posted by: AyappanP

Invoking the help lists the available tool in the system.

# git mergetool --tool-help
'git mergetool --tool=<tool>' may be set to one of the following:
                gvimdiff
                gvimdiff2
                gvimdiff3
                vimdiff
                vimdiff2
                vimdiff3

The following tools are valid, but not currently available:
                araxis
                bc
                bc3
                codecompare
                deltawalker
                diffmerge
                diffuse
                ecmerge
                emerge
                examdiff
                kdiff3
                meld
                opendiff
                p4merge
                tkdiff
                tortoisemerge
                winmerge
                xxdiff

Some of the tools listed above only work in a windowed
environment. If run in a terminal-only session, they will fail.

So , you can use vimdiff ( vim-enhanced RPM) which is available in AIX Toolbox.

Originally posted by: AyappanP

For questions related to AIX Open Source tools, one can use AIX Open Source Software forum for more visibility.

https://www.ibm.com/developerworks/community/forums/html/forum?id=2eb0f36d-9534-471b-8b27-c21e6c5b9b2b