Mercurial > hg
diff notes.txt @ 1308:2073e5a71008
Cleanup of tabs and trailing spaces.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 21 Sep 2005 07:56:19 +0200 |
parents | d7ce76d82876 |
children | 4f072bb06e89 |
line wrap: on
line diff
--- a/notes.txt Tue Sep 20 21:35:51 2005 -0700 +++ b/notes.txt Wed Sep 21 07:56:19 2005 +0200 @@ -91,7 +91,7 @@ Then for each file, we perform a graph merge and resolve as above. It's important to merge files using per-file DAGs rather than just -changeset level DAGs as this diagram illustrates: +changeset level DAGs as this diagram illustrates: M M1 M2