tests/test-conflict.out
author Volker.Kleinfeld@gmx.de
Tue, 20 Sep 2005 19:25:14 -0700
changeset 1283 f5faab34f32e
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Support for the distutils extention 'py2exe' added. Description: - If the py2exe distutils extention is installed this patch allows building standalone exe for windows - example: > python setup.py build --compiler=mingw32 py2exe - The 'out of the box' py2exe is not able to resolve the dependencies due to 'demandload'. A new helper module of scanning the mercurial package has been added. Changed: - setup.py: importing py2exe and sub classing its command class to fetch the build directory and insert the needed includes - packagescan.py: new helper module added, that scans the distutil build directory for modules to be included.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
     1
merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
     2
merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
     3
merging a failed!
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
     4
32e80765d7fe+75234512624c+ tip
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
     5
something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
     6
=======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
     7
something
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset
     8
M a