log mercurial/hg.py @ 417:f2d1f5fd0179

age author description
Tue, 21 Jun 2005 19:25:05 -0800 mpm [PATCH] file type fixes for the other 'OS'
Tue, 21 Jun 2005 19:19:39 -0800 mpm [PATCH] Removal of a file added by merging branches
Tue, 21 Jun 2005 19:14:11 -0800 mpm [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
Tue, 21 Jun 2005 19:07:13 -0800 mpm remove double assignment
Tue, 21 Jun 2005 19:06:17 -0800 mpm [PATCH]: Typo in localrepository.update
Tue, 21 Jun 2005 18:48:28 -0800 mpm [PATCH] Merging files that are deleted in both branches
Tue, 21 Jun 2005 18:41:57 -0800 mpm [PATCH] Merging identical changes from another branch