|
|
176.
|
|
|
<b>URL to merge from</b>
|
|
|
|
|
<b>URL det skal flettes fra</b>
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:6
|
|
|
177.
|
|
|
<b>Working Copy</b>
|
|
|
|
|
<b>Arbeidskopi</b>
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:7
|
|
|
178.
|
|
|
Choose this method if you have made some changes to a branch and wish to merge your changes with another branch.
|
|
|
|
|
Velg denne metoden hvis du har gjort endringer i grenen og ønsker å flette dine endringer med en annen gren.
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:8
|
|
|
179.
|
|
|
Choose this method if you wish to merge two different branches into your working copy.
|
|
|
|
|
Velg denne metoden hvis du ønsker å flette to forskjellige grener inn i din arbeidskopi.
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:9
|
|
|
180.
|
|
|
Ignore ancestry
|
|
|
|
|
Ignorer stamfedre
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:11
|
|
|
181.
|
|
|
Merge Assistant
|
|
|
|
|
Fletteassistent
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:12
|
|
|
182.
|
|
|
Merge a range of revisions
|
|
|
|
|
Flett et utvalg av revisjoner
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:13
|
|
|
183.
|
|
|
Merge two different trees
|
|
|
|
|
Flett to forskjellige trær
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:14
|
|
|
184.
|
|
|
Only record the merge
|
|
|
|
|
Kun marker fletting (ikke utfør)
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/merge.glade.h:15
|
|
|
185.
|
|
|
Recursive
|
|
|
|
|
Rekursiv
|
|
Translated and reviewed by
Arne
|
|
|
|
Located in
ui/glade/update.glade.h:4 ui/glade/merge.glade.h:16
|
