Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Mon, 10 Sep 2007 00:56:04 +0000 (20:56 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 10 Sep 2007 01:02:57 +0000 (21:02 -0400)
commit5f51ccd2598977694d383e9059e89cafb9ae1214
tree8dc3b020c388cecb38039108ef149bd7a2a40f52
parentb2bd31006f02debe1ddf4fa8b73c52281516a871
parent8938410189315979255c1dfcc3c0b7a4bf9953e5
Merge branch 'maint'

* maint:
  git-gui: Trim trailing slashes from untracked submodule names
  git-gui: Assume untracked directories are Git submodules
  git-gui: handle "deleted symlink" diff marker
  git-gui: show unstaged symlinks in diff viewer
git-gui.sh
lib/diff.tcl