diff tests/test-excessive-merge.t @ 17901:a19046744e4e stable

filemerge: only run test for issue3581 on non-windows environments
author Keegan Carruthers-Smith <keegancsmith@fb.com>
date Tue, 30 Oct 2012 17:23:51 -0700
parents b87acfda5268
children b7a966ce89ed
line wrap: on
line diff