tests/test-merge4.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 03 Nov 2008 20:05:03 +0100
changeset 7309 e74a9173c2d7
parent 6336 4b0c9c674707
permissions -rw-r--r--
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258) This gets us git diffs when enabled and doesn't pick erratic file parents.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)