hgbook
annotate ja/undo-manual-merge.dot @ 1030:2ac31ea48a3d
merge with trunk
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Thu Apr 22 12:39:32 2010 +0200 (2010-04-22) |
parents | |
children |
rev | line source |
---|---|
foozy@708 | 1 digraph undo_manual { |
foozy@708 | 2 "first change" -> "second change"; |
foozy@708 | 3 "second change" -> "third change"; |
foozy@708 | 4 backout [label="back out\nsecond change", shape=box]; |
foozy@708 | 5 "second change" -> backout; |
foozy@708 | 6 "third change" -> "manual\nmerge"; |
foozy@708 | 7 backout -> "manual\nmerge"; |
foozy@708 | 8 } |