diff -r 05e522d3f186 -r 5b66e55c0d93 tests/test-largefiles.t
--- a/tests/test-largefiles.t	Tue Dec 06 15:50:28 2011 +0100
+++ b/tests/test-largefiles.t	Fri Dec 09 17:34:58 2011 +0100
@@ -645,6 +645,23 @@
   $ cat sub2/large7
   large7
 
+Test status after merging with a branch that introduces a new largefile:
+
+  $ echo large > large
+  $ hg add --large large
+  $ hg commit -m 'add largefile'
+  $ hg update -q ".^"
+  $ echo change >> normal3
+  $ hg commit -m 'some change'
+  created new head
+  $ hg merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  getting changed largefiles
+  1 largefiles updated, 0 removed
+  $ hg status
+  M large
+
 Test that a normal file and a largefile with the same name and path cannot
 coexist.