Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 21167:1ce131b3221e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix test failures with new merge code on OS X The case collision checker was missing a op entry for 'k'eep.
author Matt Mackall <mpm@selenic.com>
date Mon, 21 Apr 2014 15:08:39 -0500
parents f4014f646f71
children 355058ad8405
comparison
equal deleted inserted replaced
21166:bf2891877378 21167:1ce131b3221e
351 "a": addop, 351 "a": addop,
352 "dm": renamemoveop, 352 "dm": renamemoveop,
353 "dg": renamegetop, 353 "dg": renamegetop,
354 "dr": nop, 354 "dr": nop,
355 "e": nop, 355 "e": nop,
356 "k": nop,
356 "f": addop, # untracked file should be kept in working directory 357 "f": addop, # untracked file should be kept in working directory
357 "g": addop, 358 "g": addop,
358 "m": mergeop, 359 "m": mergeop,
359 "r": removeop, 360 "r": removeop,
360 "rd": nop, 361 "rd": nop,