diff mercurial/merge.py @ 3092:25857e00af8e

cat: default to working dir parent instead of tip This introduces a defaultrev function that chooses the working dir parent if a revision isn't specified, and uses it in several places.
author Brendan Cully <brendan@kublai.com>
date Thu, 14 Sep 2006 19:24:00 -0700
parents db3f42261452
children fe9b13e35e46
line wrap: on
line diff