Shawn O. Pearce 37d2a1c9fa git-gui: Correctly ignore '* Unmerged path' during diff. ...

If a path is really unmerged, such as because it has been deleted and
also modifed, we cannot obtain a diff for it.  Instead Git is sending
back '* Unmerged path <blah>' for file <blah>.  We should display this
line as-is as our tag selecting switches don't recognize it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

2007-01-21 22:47:56 -05:00

.gitignore

git-gui: Ensure version number is always current.

2007-01-21 02:54:19 -05:00

git-gui.sh

git-gui: Correctly ignore '* Unmerged path' during diff.

2007-01-21 22:47:56 -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

Description

No description provided

235 MiB

Languages

C 50.1%

Shell 38.4%

Perl 5.1%

Tcl 3.3%

Python 0.8%

Other 2%