make assistant aware of adjusted branches when merging

This commit is contained in:
Joey Hess 2016-02-29 15:57:47 -04:00
parent c1d7a5b97c
commit 048d513233
Failed to extract signature
4 changed files with 30 additions and 23 deletions

View file

@ -27,7 +27,6 @@ import Annex.TaggedPush
import Annex.CatFile
import Config
import Git
import qualified Git.Branch
import qualified Types.Remote as Remote
import qualified Remote as Remote
import Remote.List