hgbook

annotate it/figs/bad-merge-1.dot @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun Dec 13 16:35:56 2009 +0900 (2009-12-13)
parents 713f0f69029a 793e15b562ef
children
rev   line source
Giulio@832 1 digraph bad_merge_1 {
gpiancastelli@844 2 ancestor [label="1: progenitore"];
Giulio@832 3 left [label="2: mia modifica"];
Giulio@832 4 right [label="3: vostra modifica"];
Giulio@832 5 bad [label="4: unione sbagliata"];
Giulio@832 6 new [label="5: nuova modifica"];
Giulio@832 7
Giulio@832 8 ancestor -> left;
Giulio@832 9 ancestor -> right;
Giulio@832 10 left -> bad;
Giulio@832 11 right -> bad;
Giulio@832 12 bad -> new;
Giulio@832 13 }