Revision 9c9f5fa97fe078b59be14a6bcabb851745ddd48c authored by Shawn O. Pearce on 23 August 2007, 06:44:13 UTC, committed by Shawn O. Pearce on 23 August 2007, 06:44:13 UTC
git-apply does not accept a patch that was generated as a three-way combined diff format such as we see during merge conflicts. If we get such a diff in our diff viewer and try to send it to git-apply it just errors out and the user is left confused wondering why they cannot stage that hunk. Instead of feeding a known to be unacceptable hunk to git-apply we now just disable the stage/unstage context menu option if the hunk came from a three way diff. The user may still be confused about why they cannot work with a combined diff, but at least they are only confused as to why git-gui is not offering them the action. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
1 parent 9f4119e
| File | Mode | Size |
|---|---|---|
| lib | ||
| .gitignore | -rw-r--r-- | 62 bytes |
| GIT-VERSION-GEN | -rwxr-xr-x | 1.8 KB |
| Makefile | -rw-r--r-- | 4.6 KB |
| git-gui.sh | -rwxr-xr-x | 63.8 KB |
Computing file changes ...
