comparison tests/test-record.t @ 31119:13bbcd56c57a

merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Feb 2017 11:13:25 -0800
parents 7074589cf22a
children da07367d683b
comparison
equal deleted inserted replaced
31116:6483e49204ee 31119:13bbcd56c57a
20 If a list of files is omitted, all changes reported by 'hg status' will be 20 If a list of files is omitted, all changes reported by 'hg status' will be
21 candidates for recording. 21 candidates for recording.
22 22
23 See 'hg help dates' for a list of formats valid for -d/--date. 23 See 'hg help dates' for a list of formats valid for -d/--date.
24 24
25 You will be prompted for whether to record changes to each modified file, 25 If using the text interface (see 'hg help config'), you will be prompted
26 and for files with multiple changes, for each change to use. For each 26 for whether to record changes to each modified file, and for files with
27 query, the following responses are possible: 27 multiple changes, for each change to use. For each query, the following
28 responses are possible:
28 29
29 y - record this change 30 y - record this change
30 n - skip this change 31 n - skip this change
31 e - edit this change manually 32 e - edit this change manually
32 33