[Enhanced] Diff not powerful enough during "Apply Patch" with conflict

When you apply a patch on CLion and look at the differences during conflict, he can't put the code in context...

Example: https://naubry-drive.mycozy.cloud/public?sharecode=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJzaGFyZSIsImlhdCI6MTU0MDk3Mjk5MywiaXNzIjoibmF1YnJ5Lm15Y296eS5jbG91ZCIsInN1YiI6ImVtYWlsIn0.K9bkMgGc74tN8ffrwqtCY_QZOqBXyJcRmIv0zfbwdyhNsGYhbI7AerF0jRjjyb4j8BFPc5Gm3ANzoyUa44zrSg&id=6a7a5fb3306a3030f71fd97b8251133a

 

Whereas on Eclipse (and it hurts me to say it) it's clearly more powerful...

Example: https://naubry-drive.mycozy.cloud/public?sharecode=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJzaGFyZSIsImlhdCI6MTU0MDk3MzYwOCwiaXNzIjoibmF1YnJ5Lm15Y296eS5jbG91ZCIsInN1YiI6ImVtYWlsIn0.NEdVkpWxdlemHQxKn2N_o2885Lc-zUVzrQkQzvGG5PKLDXnp2YGLK0pyYY7-6GGY8ivFONMK1QDfd4KMIOYh_g&id=6a7a5fb3306a3030f71fd97b82510a52

I would like to know why we have this behaviour and if there is a way to get something similar to the behaviour we see in Eclipse.

 

Thank you in advance.

 

0

Please sign in to leave a comment.