Martin Geisler
|
65537ad291
|
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
|
2009-04-26 14:29:02 +02:00 |
|
Matt Mackall
|
891ec3832e
|
resolve: keep .orig files
|
2009-03-16 16:58:41 -05:00 |
|
Matt Mackall
|
966fa4be08
|
resolve: require -a switch to resolve all files
Like revert -a, this should make this command slightly safer
|
2008-12-19 16:47:36 -06:00 |
|
Matt Mackall
|
edf5a0f5d0
|
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
|
2008-04-11 12:52:56 -05:00 |
|
Alexis S. L. Carvalho
|
cc6e60f60e
|
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
|
2007-06-22 20:44:40 -03:00 |
|