author | Vadim Gelfer <vadim.gelfer@gmail.com> |
Fri, 28 Apr 2006 15:50:22 -0700 | |
changeset 2155 | ff255b41b4aa |
parent 1933 | 7544700fd931 |
child 2175 | b2ae81a7df29 |
permissions | -rw-r--r-- |
346 | 1 |
merge: warning: conflicts during merge |
2 |
merging a |
|
3 |
merging a failed! |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
4 |
e7fe8eb3e180+0d24b7662d3e+ tip |
346 | 5 |
something else |
6 |
======= |
|
7 |
something |
|
748 | 8 |
M a |