dmerge bugfixes
This commit is contained in:
parent
a4dba5f9b9
commit
a96c2d470d
|
|
@ -104,7 +104,7 @@ if(~ $mode file) {
|
|||
echo ''
|
||||
echo '* * *'
|
||||
echo ''
|
||||
echo $annotation $srctitle
|
||||
echo $annotation $"srctitle
|
||||
echo ''
|
||||
}
|
||||
cat /tmp/content.$pid
|
||||
|
|
@ -185,7 +185,7 @@ if not if(~ $mode region) {
|
|||
echo $regionannotation
|
||||
echo ''
|
||||
}
|
||||
echo "$formatted"
|
||||
echo $"formatted
|
||||
} > /tmp/merge.$pid
|
||||
|
||||
# Write merged content to destination
|
||||
|
|
|
|||
Loading…
Reference in New Issue