git.saurik.com Git - bison.git/commit

]> git.saurik.com Git - bison.git/commit

projects / bison.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: ea99527) | patch

author	Akim Demaille <akim@epita.fr>
	Sun, 13 Oct 2002 19:35:59 +0000 (19:35 +0000)
committer	Akim Demaille <akim@epita.fr>
	Sun, 13 Oct 2002 19:35:59 +0000 (19:35 +0000)
commit	7ea9a33f3b12c4fc2c5907dd22a74c1441d2855d
tree	2a3996638cce3f34f939985e192dc4e9cd97de45	tree \| snapshot
parent	ea99527d23f1f4e1e4f358f9f495b2e4e26602af	commit \| diff

* src/print.c (print_state): Separate the list of solved conflicts
from the other items.
* tests/conflicts.at (Resolved SR Conflicts): Adjust.

ChangeLog		diff \| blob \| blame \| history
src/print.c		diff \| blob \| blame \| history
tests/conflicts.at		diff \| blob \| blame \| history

bison