diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2008-08-31 00:55:45 +0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-04 21:28:54 -0700 |
| commit | 042c232535c329f168e8a515588f38a4117954fb (patch) | |
| tree | 4c0daf23d73190a2419c6b1732921a31cf09f861 /diff.c | |
| parent | 700e560341edfe32242b6b5b3b380d6f945ec0e8 (diff) | |
| download | git-042c232535c329f168e8a515588f38a4117954fb.tar.gz | |
git-gui: Support resolving conflicts via the diff context menu.
If the file has merge conflicts, show a special version of the
diff context menu, which includes conflict resolution commands
instead of Stage Hunk/Line. This patch only supports resolving
by discarding all sides except one.
Discarding is the only way to resolve conflicts involving symlinks
and/or deletion, excluding manual editing.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions