diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2018-12-02 18:26:25 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2019-01-22 03:06:51 +0100 |
| commit | 158af7acfa54ad3f4a18cd8e697efb1341cd7e05 (patch) | |
| tree | d6e24fea6a82bf6215066493867dda97bf0926df /cabal-plan | |
| parent | 8bb123786d32f39db14dad3f7c09743d1f5f99d7 (diff) | |
git subrepo clone --branch=master --force ../cabal-plan
subrepo:
subdir: "cabal-plan"
merged: "cd93de6"
upstream:
origin: "../cabal-plan"
branch: "master"
commit: "cd93de6"
git-subrepo:
version: "0.4.0"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "5d6aba9"
Diffstat (limited to 'cabal-plan')
| -rw-r--r-- | cabal-plan/.gitrepo | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cabal-plan/.gitrepo b/cabal-plan/.gitrepo index c0cb75b..22e29c4 100644 --- a/cabal-plan/.gitrepo +++ b/cabal-plan/.gitrepo @@ -6,6 +6,7 @@ [subrepo] remote = ../cabal-plan branch = master - commit = 34506abf26df4275e8c90771587d152d1c8531f1 - parent = 12e1be31c09161dec1fa70f15ede84ba9965a365 - cmdver = 0.3.1 + commit = cd93de6ab26a15383ea9bea3005cec486be9af95 + parent = afed7936ebb2ace14bc93535019b638130b451ab + cmdver = 0.4.0 + method = merge |