annotate tests/test-conflict.out @ 1907:7718885070b1

let commands that show changesets use templates. mechanism is same as hgweb templates. old show_changeset code is still used for now if no template given, because it is faster than template code when verbose or debug. simple template can be given on command line using -t, --template. example: hg log -t '{author|person}\n' complex template can be put in template map file, given on command line using --map-file. we give two example map files: map-log.compact prints 3 lines of output for every change. map-log.verbose prints exact same output as default "hg log -v". map files are searched where user says, then in template path as backup. example: hg log --map-file map-log.compact defaults can be set in hgrc with ui.logtemplate and ui.logmap.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 27 Feb 2006 13:18:57 -0800
parents 5a034646e472
children 7544700fd931
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
1 merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
2 merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
3 merging a failed!
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
4 32e80765d7fe+75234512624c+ tip
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
5 something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
6 =======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
7 something
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset
8 M a