diff mercurial/merge.py @ 14502:deb82fdda94e stable

strip: make it clear that --force discards changes (issue310)
author Patrick Mezard <pmezard@gmail.com>
date Fri, 29 Apr 2011 14:56:23 +0200
parents 5b3383ea67d2
children 15d1db2abfcb
line wrap: on
line diff