monotone

monotone Commit Details

Date:2010-11-15 23:55:36 (8 years 7 months ago)
Author:Richard Levitte
Branch:net.venge.monotone
Commit:7ee34f5221b68c3dd59dd2a249c7c2e77ff087ab
Parents: 2a114436ed3d76c16b2a73b2172c587d98bca464
Message:Make command argument list for 'fmerge' and 'pluck' consistent with how

it's done elsewhere
Changes:
Mcmd_files.cc (1 diff)
Mcmd_merging.cc (1 diff)

File differences

cmd_files.cc
5454
5555
5656
57
57
58
5859
5960
6061
guard.commit();
}
CMD(fmerge, "fmerge", "", CMD_REF(debug), N_("<parent> <left> <right>"),
CMD(fmerge, "fmerge", "", CMD_REF(debug),
N_("PARENT_FILEID LEFT_FILEID RIGHT_FILEID"),
N_("Merges 3 files and outputs the result"),
"",
options::opts::none)
cmd_merging.cc
12431243
12441244
12451245
1246
1246
12471247
12481248
12491249
output << merge_data;
}
CMD(pluck, "pluck", "", CMD_REF(workspace), N_("[-r FROM] -r TO [PATH...]"),
CMD(pluck, "pluck", "", CMD_REF(workspace), N_("[PATH...]"),
N_("Applies changes made at arbitrary places in history"),
N_("This command takes changes made at any point in history, and "
"edits your current workspace to include those changes. The end result "

Archive Download the corresponding diff file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status