[PATCH stable] merge: don't overwrite file untracked after remove, abort with 'untracked files'

Matt Mackall mpm at selenic.com
Sun Feb 9 18:16:23 CST 2014


On Mon, 2014-02-10 at 00:46 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1391989434 -3600
> #      Mon Feb 10 00:43:54 2014 +0100
> # Branch stable
> # Node ID e4d7cbc94219e54f5e73df9c2f88eca3d46d7f90
> # Parent  6863d42eb59a39ea483eec0728b3a5d6836d20b6
> merge: don't overwrite file untracked after remove, abort with 'untracked files'

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list