| commit | b2ca414973c3bcd00f2b94538bd9c755387f30a0 | |
| author | Alexander Gavrilov <angavrilov@gmail.com> | |
| Sat, 30 Aug 2008 21:05:22 +0000 (31 01:05 +0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 5 Sep 2008 04:28:55 +0000 (4 21:28 -0700) | ||
| tree | a9b00cc6baa3ca534d70cc65548bec8b2770f786 | treesnapshot (tar.gz zip) |
| parent | 8056cc4f293b5e2bf0520f085e25b127c2ef3bbf | commitdiff |
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>
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>
| lib/diff.tcl | diffblobblamehistory |