git.99rst.org Git - git.git/commit

author	Shawn O. Pearce <redacted>
	Sun, 21 Oct 2007 00:43:36 +0000 (20:43 -0400)
committer	Shawn O. Pearce <redacted>
	Sun, 21 Oct 2007 00:43:36 +0000 (20:43 -0400)
commit	c9dcc7f865fb7891f4f6d068230663eb2cb586a7
tree	dda2dc1770bbc3115a4487f0b32e3323e899fd97	tree \| snapshot
parent	a5bb31fb6323b53559b0d15ce2d02a7ba6d74bed	commit \| diff
parent	bbbadf6e58f72ac6bf739d2a1109cbd872eb1083	commit \| diff

Merge branch 'maint'

* maint:
  git-gui: Don't display CR within console windows
  git-gui: Handle progress bars from newer gits
  git-gui: Correctly report failures from git-write-tree

Conflicts:

lib/commit.tcl
lib/console.tcl

lib/commit.tcl	diff1 \|	diff2 \|	blob \| history
lib/console.tcl	diff1 \|	diff2 \|	blob \| history
lib/status_bar.tcl	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

lib/commit.tcl	diff1 \|	diff2 \|	blob \| history
lib/console.tcl	diff1 \|	diff2 \|	blob \| history
lib/status_bar.tcl	diff1 \|	diff2 \|	blob \| history