# |
Date |
Size |
|
Editor |
Comment |
Action |
178 |
2010-11-17 07:52:36 |
17776 |
to previous |
NicolasDumazet |
break long lines |
view |
177 |
2010-11-17 07:51:21 |
17759 |
to previous |
NicolasDumazet |
break long line |
view |
176 |
2010-11-17 07:49:49 |
17755 |
to previous |
NicolasDumazet |
typo / fix script |
view |
175 |
2010-11-17 07:45:10 |
17755 |
to previous |
NicolasDumazet |
style only |
view |
174 |
2010-11-17 07:31:25 |
17682 |
to previous |
NicolasDumazet |
merge curstom-diff-related sections, rephrase it a bit. |
view |
173 |
2010-11-17 07:16:29 |
17577 |
to previous |
NicolasDumazet |
Archive is a builtin command, and should be used for exports. The other examples should come after, as illustrations. |
view |
172 |
2010-11-17 07:11:14 |
17680 |
to previous |
NicolasDumazet |
how to remove unknown files -> redirect to PurgeExtension |
view |
171 |
2010-11-17 07:04:39 |
17871 |
to previous |
NicolasDumazet |
link directly to colorExtension to colorize diffs, only mention ExtdiffExtension as a compatibility trick |
view |
170 |
2010-09-17 09:52:39 |
17861 |
to previous |
PeerStritzinger |
Small clarification if #35 |
view |
169 |
2010-09-17 09:51:14 |
17852 |
to previous |
PeerStritzinger |
Added trick #35 |
view |
168 |
2010-07-22 10:38:21 |
16540 |
to previous |
FriedrichKastner |
fixed typo "tham" |
view |
167 |
2010-07-21 14:00:36 |
16540 |
to previous |
AlexanderSolovyov |
|
view |
166 |
2010-07-21 13:59:50 |
16532 |
to previous |
AlexanderSolovyov |
|
view |
165 |
2010-04-29 11:48:58 |
16367 |
to previous |
abuehl |
Revert to revision 163. |
view |
164 |
2010-04-29 10:41:45 |
16426 |
to previous |
CrazyJohn |
|
view |
163 |
2010-04-23 15:12:31 |
16367 |
to previous |
FredrikJonson |
Added useful "shelve" command found on the mailing list. |
view |
162 |
2010-04-12 20:43:09 |
15738 |
to previous |
DavidChampion |
add mention of headcount hook for preventing new heads on push |
view |
161 |
2010-02-19 14:47:30 |
15677 |
to previous |
GregWard |
rewrite "log all csets that would be merged" (and mention merge --preview) |
view |
160 |
2010-02-19 14:16:33 |
14951 |
to previous |
GregWard |
fix incorrect "how to undo hg add" instructions |
view |
159 |
2009-12-11 17:19:01 |
14707 |
to previous |
MartinGeisler |
|
view |
158 |
2009-12-11 17:17:30 |
14706 |
to previous |
MartinGeisler |
The DEFAULT section no longer applies, explain env var expansion instead |
view |
157 |
2009-12-01 16:41:47 |
15510 |
to previous |
PaulBoddie |
Fixed vim diff documentation link. Tidied binary files text. |
view |
156 |
2009-11-30 20:38:00 |
15471 |
to previous |
MartinGeisler |
Better dummy-merge example |
view |
155 |
2009-11-22 18:00:32 |
15408 |
to previous |
PierreAsselin |
|
view |
154 |
2009-11-07 19:35:55 |
15515 |
to previous |
FaheemMitha |
|
view |
153 |
2009-11-07 19:32:07 |
15515 |
to previous |
FaheemMitha |
|
view |
152 |
2009-10-29 17:26:45 |
15402 |
to previous |
Ry4anBrase |
add a bash function for driving debugancestor to answer "Is X a descendant of Y" |
view |
151 |
2009-09-28 23:50:15 |
15068 |
to previous |
ChristianEbert |
fix link to vimdiff docs |
view |
150 |
2009-09-24 13:47:49 |
15069 |
to previous |
DougPhilips |
Added prevent multiple heads entry with links to sample hook code. |
view |
149 |
2009-09-08 15:41:26 |
14018 |
to previous |
Ry4anBrase |
Added template tip |
view |
148 |
2009-09-08 14:38:48 |
13728 |
to previous |
Fj |
$base $local silently discards the other's data you are supposed to be merging in. |
view |
147 |
2009-08-06 02:33:59 |
13727 |
to previous |
Ry4anBrase |
|
view |
146 |
2009-06-24 13:10:48 |
13323 |
to previous |
ArneBab |
Added Tip for working with generated binary files which have to be present at every stage of the work. |
view |
145 |
2009-06-21 20:41:46 |
11563 |
to previous |
MartinGeisler |
Re-did keep my or their answer |
view |
144 |
2009-05-19 19:31:05 |
11832 |
to previous |
localhost |
converted to 1.6 markup |
view |
143 |
2009-04-03 18:26:30 |
11811 |
to previous |
Ry4anBrase |
Added formail multi-patch import tip. |
view |
142 |
2009-03-03 18:06:36 |
11463 |
to previous |
MathieuClabaut |
HGMERGE=true hg merge -y -r otherrev |
view |
141 |
2009-03-03 11:12:55 |
11258 |
to previous |
MathieuClabaut |
'''Note''' that merge-patterns configuration will take precedence over the defau |
view |
140 |
2009-01-07 19:38:56 |
11054 |
to previous |
BrendanCully |
deprecate extdiff-based color diff |
view |
139 |
2009-01-02 15:27:37 |
10946 |
to previous |
PierreAsselin |
[RCS merge] ask about merge tools that write to stdout |
view |
138 |
2009-01-01 21:30:19 |
10802 |
to previous |
PierreAsselin |
How to use /usr/bin/merge (from RCS) for text merges |
view |
137 |
2008-12-02 19:24:27 |
10488 |
to previous |
EthanMallove |
Added tip for using Vim as filemerge program |
view |
136 |
2008-11-27 09:41:35 |
10083 |
to previous |
WilliamRoberts |
Added --config equivalent to the "Keep my or their..." tip + some rewording. |
view |
135 |
2008-11-17 14:59:02 |
9927 |
to previous |
PeterArrenbrecht |
Add tip about emulating `hg incoming` for merges of heads |
view |
134 |
2008-09-25 12:11:23 |
9580 |
to previous |
SimonHeimberg |
|
view |
133 |
2008-09-20 08:28:24 |
9566 |
to previous |
SimonHeimberg |
Tip about converting line endings in a repo |
view |
132 |
2008-08-20 15:20:53 |
8854 |
to previous |
SimonHeimberg |
new tip for option --config |
view |
131 |
2008-07-17 16:41:44 |
8531 |
to previous |
TomBa |
how to split a subdirectory into a separate project |
view |
130 |
2008-07-16 04:27:18 |
8428 |
to previous |
DougPhilips |
Added explaination for internal:fail on the merge tool. |
view |
129 |
2008-07-10 05:58:10 |
8261 |
to previous |
PeterArrenbrecht |
New tip: Ignore files in local working copy only |
view |