Alexander Gavrilov ff515d81fa git-gui: Support conflict states _U & UT. ... Support _U (local deleted, remote modified) and UT (file type changed in conflict) modes. Note that 'file type changed' does not refer to changes in the executable bit, instead it denotes replacing a file with a link, or vice versa. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2008-09-04 21:28:55 -07:00
..
about.tcl
blame.tcl
branch_checkout.tcl
branch_create.tcl
branch_delete.tcl
branch_rename.tcl
branch.tcl
browser.tcl
checkout_op.tcl
choose_font.tcl
choose_repository.tcl
choose_rev.tcl
class.tcl
commit.tcl	git-gui: Support conflict states _U & UT.	2008-09-04 21:28:55 -07:00
console.tcl
database.tcl
date.tcl
diff.tcl	git-gui: Support conflict states _U & UT.	2008-09-04 21:28:55 -07:00
encoding.tcl
error.tcl
git-gui.ico
index.tcl	git-gui: Support conflict states _U & UT.	2008-09-04 21:28:55 -07:00
logo.tcl
merge.tcl
mergetool.tcl
option.tcl
remote_branch_delete.tcl
remote.tcl
shortcut.tcl
spellcheck.tcl
status_bar.tcl
transport.tcl
win32_shortcut.js
win32.tcl