tests/test-merge3.out
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
Tue, 20 Sep 2005 21:35:51 -0700
changeset 1285 1546c2aa6b30
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
Make 'hg import' platform independent. - moved popen("patch ...") from commands.py to util.py - files may not be single quoted in popen under windows: fixed - patch returns the files quoted under windows. quotes need to be stripped off: fixed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     1
removing b
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     2
b never committed!
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
     3
nothing changed