diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-08-22 16:14:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-08-22 16:14:12 -0400 |
| commit | 203148363f459635b1be40b8c6ed376073230dda (patch) | |
| tree | 422df5684fc77663c6a3c7fd601c1eff27b3758b /Git/UnionMerge.hs | |
| parent | 4c73d77b42e97ad740d5731ad73c40a31c0c84f9 (diff) | |
split groups of related functions out of Utility
Diffstat (limited to 'Git/UnionMerge.hs')
| -rw-r--r-- | Git/UnionMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index b0da07170..a5bcbeac4 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -18,7 +18,7 @@ import Data.Maybe import Data.String.Utils import Git -import Utility +import Utility.SafeCommand {- Performs a union merge between two branches, staging it in the index. - Any previously staged changes in the index will be lost. |