Joey Hess 240bae38f6 sync: When in an adjusted branch, merge changes from the original branch ... This causes changes to the original branch to get merged with a single sync. Before, it took 2 syncs; the first happened to update the synced/ branch, and the second merged changes from the synced/ branch into the ajusted branch. Using mergeToAdjustedBranch when tomerge == origbranch is probably overkill, but it does work fine. Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project		2023-07-06 12:42:24 -04:00
..
Merge.hs	sync: When in an adjusted branch, merge changes from the original branch	2023-07-06 12:42:24 -04:00
Name.hs	improve adjusted branch name parsing to support adjusted view branches	2023-02-27 14:09:05 -04:00