view templates/raw/map @ 4358:465b9ea02868

Import 3-way merge code from bzr merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents de081fbb27fe
children
line wrap: on
line source

header = header.tmpl
footer = ''
changeset = changeset.tmpl
difflineplus = '#line#'
difflineminus = '#line#'
difflineat = '#line#'
diffline = '#line#'
changesetparent = '# Parent #node#'
changesetchild = '# Child #node#'
filenodelink = ''
filerevision = '#rawfileheader##raw#'
fileline = '#line#'
diffblock = '#lines#'
filediff = filediff.tmpl
fileannotate = fileannotate.tmpl
annotateline = '#author#@#rev#: #line#'
manifest = manifest.tmpl
manifestdirentry = 'drwxr-xr-x {basename}\n'
manifestfileentry = '{permissions|permissions} {size} {basename}\n'
index = index.tmpl
indexentry = '#url#\n'