view tests/test-simplemerge-cmd.out @ 12311:8afbf44cfe86

win32: update build instructions with correct CRT version

As stated in http://msdn.microsoft.com/en-us/library/cc664727.aspx, when you
compile an application with MSVC 2008 SP1 it is bound by default to the
original CRT version (9.0.21022.8). This is the case for Python 2.6 up to 3.1.
If the wrong CRT version is embedded in the Inno Setup installer, with a PC
that does not have the MSVC 2008 redistributable package installed, hg will
refuse to launch with an error: "the system cannot execute the specified
program".

% changing local directly
merge succeeded
local
base
other
% printing to stdout
local
base
other
 local:
local
base
% conflicts
base
<<<<<<< conflict-local
not other
=======
other
>>>>>>> conflict-other
end
warning: conflicts during merge.
merge failed
% --no-minimal
base
<<<<<<< conflict-local
not other
end
=======
other
end
>>>>>>> conflict-other
warning: conflicts during merge.
% 1 label
base
<<<<<<< foo
not other
=======
other
>>>>>>> conflict-other
end
warning: conflicts during merge.
% 2 labels
base
<<<<<<< foo
not other
=======
other
>>>>>>> bar
end
warning: conflicts during merge.
% too many labels
abort: can only specify two labels.
% binary file
abort: binary-local looks like a binary file.
% binary file --text
warning: binary-local looks like a binary file.
\x00local
base
other
% help
simplemerge [OPTS] LOCAL BASE OTHER

    Simple three-way file merge utility with a minimal feature set.

    Apply to LOCAL the changes necessary to go from BASE to OTHER.

    By default, LOCAL is overwritten with the results of this operation.

options:
 -L --label       labels to use on conflict markers
 -a --text        treat all files as text
 -p --print       print results instead of overwriting LOCAL
    --no-minimal  do not try to minimize conflict regions
 -h --help        display help and exit
 -q --quiet       suppress output
% wrong number of arguments
simplemerge: wrong number of arguments
simplemerge [OPTS] LOCAL BASE OTHER

    Simple three-way file merge utility with a minimal feature set.

    Apply to LOCAL the changes necessary to go from BASE to OTHER.

    By default, LOCAL is overwritten with the results of this operation.

options:
 -L --label       labels to use on conflict markers
 -a --text        treat all files as text
 -p --print       print results instead of overwriting LOCAL
    --no-minimal  do not try to minimize conflict regions
 -h --help        display help and exit
 -q --quiet       suppress output
% bad option
simplemerge: option --foo not recognized
simplemerge [OPTS] LOCAL BASE OTHER

    Simple three-way file merge utility with a minimal feature set.

    Apply to LOCAL the changes necessary to go from BASE to OTHER.

    By default, LOCAL is overwritten with the results of this operation.

options:
 -L --label       labels to use on conflict markers
 -a --text        treat all files as text
 -p --print       print results instead of overwriting LOCAL
    --no-minimal  do not try to minimize conflict regions
 -h --help        display help and exit
 -q --quiet       suppress output