view tests/test-patch.out @ 6672:6004eedb13f4

keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
author Christian Ebert <blacktrash@gmx.net>
date Thu, 12 Jun 2008 02:27:06 +0200
parents 0750f11152fe
children 7b19cda0fa10
line wrap: on
line source

adding a
% check custom patch options are honored
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying ../a.diff
Using custom patch
nothing changed