version control - In Mercurial, how to "merge" with the commit's (single) parent? -

i've worked on project. i'm able see difference between project , (sole) parent with:

hg kdiff3 

(after i've configured "kdiff3" shown here). however, want able edit files, perhaps remove of changes, edit of them or make new changes. command shows me differences, rather let me edit them. if try:

hg merge 5861231e8335 

(when "5861231e8335" (sole) parent of working directory) get:

abort: merging working directory ancestor has no effect 

so how can "merge" parent? (preferably using "kdiff3")

first, have misunderstood hg merge does. merges changesets 2 parents. doesn't merge uncommitted changes.

to merge uncommitted changes current tip changeset, want:

hg commit --amend 

which replaces current tip new one.

to answer question editing in differencer. i'm not aware of method of editing bunch of files in file differencer; that's because set of files copied temp directory it's pointless edit them. can however, diff , edit 1 file @ time because 1 file diffed in place without copying temp directory.

but surely, isn't better edit files in normal editor rather in file differencer? surely, 1 can edit, last resort. otoh, if use trick of viewing diffs 1 file @ time, possible edit in real editor, watch diffs change in differencer.