Merge branch 'maint'

spearce · spearce · commit aa751960178a · 2007-06-11T19:06:15.000-04:00
* maint:
  git-gui: Include 'war on whitespace' fixes from git.git
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -78,5 +78,3 @@ test "$VN" = "$VC" || {
 	echo >&2 "GITGUI_VERSION = $VN"
 	echo "GITGUI_VERSION = $VN" >$GVF
 }
-
-
diff --git a/lib/class.tcl b/lib/class.tcl
@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {
 		[format { [list source [file join $dir %s]]} \
 		[file split $scriptFile]] "\n"
 }
-

Original file line number	Diff line number	Diff line change
`@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {`
`151`	`151`	`[format { [list source [file join $dir %s]]} \`
`152`	`152`	`[file split $scriptFile]] "\n"`
`153`	`153`	`}`
`154`		`-`