hgbook

annotate en/undo-manual-merge.dot @ 281:a880d07f2d29

find changesets by author, revision, files, or words in the commit message
Fix repository paths of data/index files in filelog diagram.

Data/index files are stored in the repository at .hg/store/data, not .hg/data.
Modify the filelog diagram to reflect this.
author Arun Thomas <arun.thomas@gmail.com>
date Mon Dec 17 23:16:59 2007 -0500 (2007-12-17)
parents
children
rev   line source
bos@124 1 digraph undo_manual {
bos@124 2 "first change" -> "second change";
bos@124 3 "second change" -> "third change";
bos@124 4 backout [label="back out\nsecond change", shape=box];
bos@124 5 "second change" -> backout;
bos@124 6 "third change" -> "manual\nmerge";
bos@124 7 backout -> "manual\nmerge";
bos@124 8 }