diff options
author | 2014-02-25 11:42:08 +0000 | |
---|---|---|
committer | 2014-02-25 11:42:08 +0000 | |
commit | 683353236dc28678b95093fcb976881bfb01a433 (patch) | |
tree | b0f7154ccc55efb8d4184e6241faf17148741599 /git-union-merge.hs | |
parent | 6cc6cf01d1644df543d3e264d3f9ddb44e64424b (diff) |
Added a comment: Customise conflict resolution behaviour
Diffstat (limited to 'git-union-merge.hs')
0 files changed, 0 insertions, 0 deletions