Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 5 Sep 2008 04:53:06 +0000 (21:53 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 5 Sep 2008 04:53:06 +0000 (21:53 -0700)
commit95b6a2db25c6c3321be33ac17b6b2e54c407652d
tree0fa5fd758089f21623f36acdb8f1217baccc7cff
parentb2ca414973c3bcd00f2b94538bd9c755387f30a0
parentca53c3fdcf69f620331f3822cef36d95b5cf5640
Merge branch 'maint'

* maint:
  git-gui: Fix diff parsing for lines starting with "--" or "++"
lib/diff.tcl