diff tests/test-rebase-conflicts.out @ 9519:0d3c1aa9d5de

extdiff: fix defaulting to "diff" if no --program is given
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Thu, 01 Oct 2009 08:50:10 +0200
parents 45495d784ad6
children 4bb4895e1693
line wrap: on
line diff