projects / c11tester.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9c085ae) | patch
action: don't merge twice in read_from()
authorBrian Norris <banorris@uci.edu>
Fri, 10 Aug 2012 21:59:20 +0000 (14:59 -0700)
committerBrian Norris <banorris@uci.edu>
Thu, 16 Aug 2012 17:30:26 +0000 (10:30 -0700)
commit16c741a1826b66ff5bb1f2b29311aa95cad08089
tree9666bdd21c45ca4c98f1da02ffcb4810d98344a6tree | snapshot
parent9c085ae909dbe3aba08a518cc7c9ac6134773108commit | diff
action: don't merge twice in read_from()

synchronize_with() already takes care of the clock vector merging, so don't
merge a second time.
action.cc diff | blob | history
C11 Tester Tool Public Repository