Mercurial > hg
view tests/test-merge4.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 | 4b0c9c674707 |
children |
line wrap: on
line source
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)