adam
|
08df492348
|
CONFLICTs need to stay on one line for Cfg::Utils::preempt_conflict()
|
2011-11-09 23:16:09 +00:00 |
|
|
adam
|
9fd7eab0d1
|
tidy up CONFLICT output
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
024404df48
|
give more helpful conflict messages
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
ec7d169446
|
fix RelativePath for relative paths and other corner cases
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
a37e8f00ed
|
small tidying
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
b623fb6de6
|
always ignore CVS and cfgsave
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
9dbb601da0
|
-c implies -n
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
59778b9596
|
-p for pruning
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
d2afbae421
|
JoinPaths is weird after all
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
921041f2a8
|
*** empty log message ***
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
3cd2580cfe
|
more comments
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
5844b34608
|
comments on $pure, $othercollection
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
61a1944b81
|
numerous refactorings and comments to improve legibility
|
2011-11-09 23:16:08 +00:00 |
|
|
adam
|
17b23979dd
|
*** empty log message ***
|
2011-11-09 23:15:14 +00:00 |
|