Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
#header#
<title>#repo|escape#: changelog</title>
<link rel="alternate" type="application/rss+xml"
href="?cmd=changelog;style=rss" title="RSS feed for #repo|escape#">
</head>
<body>
<div class="buttons">
<a href="?cmd=tags">tags</a>
<a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>
<a type="application/rss+xml" href="?cmd=changelog;style=rss">rss</a>
</div>
<h2>changelog for #repo|escape#</h2>
<form action="#">
<p>
<label for="search1">search:</label>
<input type="hidden" name="cmd" value="changelog">
<input name="rev" id="search1" type="text" size="30">
navigate: <small>#changenav%naventry#</small>
</p>
</form>
#entries%changelogentry#
<form action="#">
<p>
<label for="search2">search:</label>
<input type="hidden" name="cmd" value="changelog">
<input name="rev" id="search2" type="text" size="30">
navigate: <small>#changenav%naventry#</small>
</p>
</form>
#footer#