Use p4merge (also require update to .gitconfig)
Use p4merge (also require update to .gitconfig)

hernandezgustavo/boxenTest,hernandezgustavo/boxenTest,hernandezgustavo/boxenTest,hernandezgustavo/boxenTest