|
|
462.
|
|
|
<b>Working Copy</b>
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:7
|
|
|
463.
|
|
|
Choose this method if you have made some changes to a branch and wish to merge your changes with another branch.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:8
|
|
|
464.
|
|
|
Choose this method if you wish to merge two different branches into your working copy.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:9
|
|
|
465.
|
|
|
Ignore ancestry
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:11
|
|
|
466.
|
|
|
Merge Assistant
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:12
|
|
|
467.
|
|
|
Merge a range of revisions
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:13
|
|
|
468.
|
|
|
Merge two different trees
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:14
|
|
|
469.
|
|
|
Only record the merge
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:15
|
|
|
470.
|
|
|
Show log
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:18
|
|
|
471.
|
|
|
Test Merge
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
ui/glade/merge.glade.h:19
|
