Shawn O. Pearce 079d0d5057 git-gui: Fix bug in unmerged file display. ... We were not correctly setting the old state of an index display to _ if the index was previously unmerged. This caused us to try and update a U->M when resolving a merge conflict but we were unable to do so as the icon did not exist in the index viewer. Tk did not like being asked to modify an icon which was undefined. Now we always transform both the old and the new states for both sides (index and working directory) prior to updating the UI. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2007-01-21 22:47:54 -05:00
.gitignore	git-gui: Ensure version number is always current.	2007-01-21 02:54:19 -05:00
GIT-VERSION-GEN	git-gui: Ensure version number is always current.	2007-01-21 02:54:19 -05:00
Makefile	git-gui: Ensure version number is always current.	2007-01-21 02:54:19 -05:00
TODO	git-gui: Updated todo list.	2006-11-25 23:16:16 -05:00
git-gui.sh	git-gui: Fix bug in unmerged file display.	2007-01-21 22:47:54 -05:00