summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-30 13:12:51 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-30 13:12:51 -0400
commit5fe02f280726442496303859e83f9ce1c48be0cb (patch)
tree004f47441faed4b1af09b5bdb425399b058d83f8 /git-union-merge.hs
parent8562e6096ca9a6819c04b4fd1938202ccd68c701 (diff)
more robust git cat-file output parser
Only remaining ugliness is the handling of error messages for files that are not present on the branch.
Diffstat (limited to 'git-union-merge.hs')
0 files changed, 0 insertions, 0 deletions