What: Claude now detects when git is in the middle of a rebase, merge, cherry-pick, or revert operation and skips the diff display to avoid confusing partial state.
Details:
Added rm5() function at line 405566 that checks for git state files:
MERGE_HEAD - merge in progress
REBASE_HEAD - rebase in progress
CHERRY_PICK_HEAD - cherry-pick in progress
REVERT_HEAD - revert in progress
The ky2() function at line 405477 now calls rm5() and returns early if any state file exists
Evidence: New function added at line 16108, integration at line 17927