Sun, 17 Sep 2006 20:43:06 -0500 |
Matt Mackall |
merge: simplify prompt code
|
Sun, 17 Sep 2006 20:38:02 -0500 |
Matt Mackall |
merge: simplify exec flag handling
|
Sun, 17 Sep 2006 20:18:27 -0500 |
Matt Mackall |
merge: simplify tests for local changed/remote deleted
|
Sun, 17 Sep 2006 20:10:54 -0500 |
Matt Mackall |
merge: more simplification of m2 manifest scanning
|
Sun, 17 Sep 2006 20:00:14 -0500 |
Matt Mackall |
merge: reorder tests on m2 items in manifestmerge
|
Sun, 17 Sep 2006 19:54:01 -0500 |
Matt Mackall |
merge: eliminate redundant security check
|
Sun, 17 Sep 2006 19:53:19 -0500 |
Matt Mackall |
merge: eliminate confusing queued variable
|
Sun, 17 Sep 2006 18:28:50 -0500 |
Matt Mackall |
merge: remove no longer possible clause
|
Sun, 17 Sep 2006 17:39:19 -0500 |
Matt Mackall |
merge: move apply and dirstate code into separate functions
|
Sun, 17 Sep 2006 17:13:02 -0500 |
Matt Mackall |
merge: remove linear variable
|
Sun, 17 Sep 2006 17:07:44 -0500 |
Matt Mackall |
merge: simplify hook code
|
Sun, 17 Sep 2006 16:50:17 -0500 |
Matt Mackall |
merge: linear_path -> linear
|
Sun, 17 Sep 2006 16:47:33 -0500 |
Matt Mackall |
merge: pull manifest checks and updates into separate functions
|
Sun, 17 Sep 2006 16:13:34 -0500 |
Matt Mackall |
merge: remove now unused umap dict
|
Sun, 17 Sep 2006 16:13:03 -0500 |
Matt Mackall |
merge: pull manifest comparison out into separate function
|
Sun, 17 Sep 2006 16:02:09 -0500 |
Matt Mackall |
Merge with mainline
|
Sun, 17 Sep 2006 15:59:59 -0500 |
Matt Mackall |
merge: move set_exec to actions
|
Sun, 17 Sep 2006 15:54:51 -0500 |
Matt Mackall |
merge: add forget to action list
|
Sun, 17 Sep 2006 15:24:00 -0500 |
Matt Mackall |
merge: add codes to action list, eliminate None elements
|
Sun, 17 Sep 2006 15:10:56 -0500 |
Matt Mackall |
merge: convert actions to list
|
Fri, 15 Sep 2006 16:01:16 -0500 |
Matt Mackall |
Merge with backout
|
Fri, 15 Sep 2006 16:00:16 -0500 |
Matt Mackall |
Back out trusted hgrc change for now
|
Fri, 15 Sep 2006 15:22:45 -0500 |
Matt Mackall |
Merge with crew
|
Tue, 22 Aug 2006 21:02:25 -0500 |
Matt Mackall |
merge: fold umap and added into m1 manifest
|
Tue, 22 Aug 2006 19:39:54 -0500 |
Matt Mackall |
merge: make unresolved a counter
|
Tue, 22 Aug 2006 19:32:16 -0500 |
Matt Mackall |
merge: use context code to retrieve manifests
|
Fri, 15 Sep 2006 22:55:17 +0200 |
Mathieu Clabaut |
Update [extdiff] configuration sample for vimdiff,
|
Wed, 13 Sep 2006 13:14:08 -0700 |
Matt Doar |
Add support for diffstat in commit emails, and move diffstat from
|