Mercurial > hg
annotate templates/map-cmdline.compact @ 4682:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 22 Jun 2007 20:44:40 -0300 |
parents | 8f565af14095 |
children | b24290c72a1d |
rev | line source |
---|---|
1914
a5bf0030df5f
make --style=compact look for map-cmdline.compact.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1913
diff
changeset
|
1 changeset = '{rev}{tags}{parents} {node|short} {date|isodate} {author|user}\n {desc|firstline|strip}\n\n' |
1919
8f565af14095
add changeset_quiet to templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1914
diff
changeset
|
2 changeset_quiet = '{rev}:{node|short}\n' |
1908
be71c04d62c0
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1907
diff
changeset
|
3 start_tags = '[' |
be71c04d62c0
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1907
diff
changeset
|
4 tag = '{tag},' |
be71c04d62c0
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1907
diff
changeset
|
5 last_tag = '{tag}]' |
1907
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 start_parents = ':' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 parent = '{rev},' |
7718885070b1
let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 last_parent = '{rev}' |