diff options
| author |  Alexander Gavrilov <angavrilov@gmail.com> | 2008-08-31 01:05:22 +0400 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-04 21:28:55 -0700 |
| commit | b2ca414973c3bcd00f2b94538bd9c755387f30a0 (patch) | |
| tree | a9b00cc6baa3ca534d70cc65548bec8b2770f786 /gitk-git | |
| parent | git-gui: Make F5 reselect a diff, if an untracked file is selected. (diff) | |
| download | tgif-b2ca414973c3bcd00f2b94538bd9c755387f30a0.tar.xz | |
git-gui: Show special diffs for complex conflict cases.
Add special handling for displaying diffs of modified/deleted,
and symlink/mode conflicts. Currently the display is completely
unusable for deciding how to resolve the conflict.
New display modes:
1) Deleted/Modified conflict: e.g.
LOCAL: deleted
REMOTE:
[diff :1:$path :3:$path]
2) Conflict involving symlinks:
LOCAL:
[diff :1:$path :2:$path]
REMOTE:
[diff :1:$path :3:$path]
In order to be able to display multiple diffs, this
patch adds a queue of commands to call.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions