diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-16 18:53:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-16 19:41:26 -0400 |
| commit | 6cddda4143d00e3a153d9cfbb567b11306677d11 (patch) | |
| tree | 44ceb6eda48515be4030016c2aa4c1d406f39aea /Assistant.hs | |
| parent | 601ee470af277ad3d0041b6ce425d808075dc997 (diff) | |
make the merger merge any equivilant sync branch into the current branch
Not just synced/master, but synced/UUID/master, for example
Diffstat (limited to 'Assistant.hs')
0 files changed, 0 insertions, 0 deletions