git/lib at b2ca414973c3bcd00f2b94538bd9c755387f30a0 - git

History

Alexander Gavrilov b2ca414973 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>		16 years ago
..
about.tcl	git-gui: Ensure all spellchecker 'class' variables are initialized	17 years ago
blame.tcl	git-gui: Allow specifying an initial line for git gui blame.	16 years ago
branch.tcl	git-gui: Always use absolute path to all git executables	18 years ago
branch_checkout.tcl	Mark strings for translation.	17 years ago
branch_create.tcl	git-gui: Setup branch.remote,merge for shorthand git-pull	17 years ago
branch_delete.tcl	git-gui: Delete branches with 'git branch -D' to clear config	17 years ago
branch_rename.tcl	git-gui: Paper bag fix missing translated strings	17 years ago
browser.tcl	git-gui: Allow specifying an initial line for git gui blame.	16 years ago
checkout_op.tcl	git-gui: Setup branch.remote,merge for shorthand git-pull	17 years ago
choose_font.tcl	git-gui: if a background colour is set, set foreground colour as well	17 years ago
choose_repository.tcl	git-gui: Vertically align textboxes with labels	17 years ago
choose_rev.tcl	git-gui: Work around random missing scrollbar in revision list	17 years ago
class.tcl	git-gui: Fix window manager problems on ion3	17 years ago
commit.tcl	git-gui: Support conflict states _U & UT.	16 years ago
console.tcl	git-gui: if a background colour is set, set foreground colour as well	17 years ago
database.tcl	git-gui: Report less precise object estimates for database compression	17 years ago
date.tcl	git-gui: Localize commit/author dates when displaying them	17 years ago
diff.tcl	git-gui: Show special diffs for complex conflict cases.	16 years ago
encoding.tcl	git-gui: Translate standard encoding names to Tcl ones	18 years ago
error.tcl	git-gui: if a background colour is set, set foreground colour as well	17 years ago
git-gui.ico	git-gui: Improve the application icon on Windows.	17 years ago
index.tcl	git-gui: Support conflict states _U & UT.	16 years ago
logo.tcl	git-gui: Refactor Henrik Nyh's logo into its own procedure	17 years ago
merge.tcl	git-gui: MERGE_RR lives in .git/ directly with newer Git versions	17 years ago
mergetool.tcl	git-gui: Reimplement and enhance auto-selection of diffs.	16 years ago
option.tcl	git-gui: Support calling merge tools.	16 years ago
remote.tcl	git-gui: Consolidate the Fetch and Push menus into a Remote menu	17 years ago
remote_branch_delete.tcl	git-gui: add some strings to translation	17 years ago
shortcut.tcl	git-gui: Use proper Windows shortcuts instead of bat files	17 years ago
spellcheck.tcl	git-gui: Don't use '$$cr master' with aspell earlier than 0.60	17 years ago
status_bar.tcl	Merge branch 'maint'	17 years ago
transport.tcl	git-gui: Allow forced push into remote repository	17 years ago
win32.tcl	git-gui: Use proper Windows shortcuts instead of bat files	17 years ago
win32_shortcut.js	git-gui: Use proper Windows shortcuts instead of bat files	17 years ago