aboutsummaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-09-24 00:51:42 +0200
committerJunio C Hamano <gitster@pobox.com>2007-09-23 17:14:03 -0700
commitd38eb710d92864b0b1f7cd36f17e273e3d8c735c (patch)
tree4c92295173e9afab8eca87ce321fc0dc40e5a669 /Documentation/merge-options.txt
parent2ae4fd7695abcf2ab36f3fe984cc4ca44559635f (diff)
downloadgit-d38eb710d92864b0b1f7cd36f17e273e3d8c735c.tar.gz
git-d38eb710d92864b0b1f7cd36f17e273e3d8c735c.tar.xz
git-merge: refactor option parsing
Move the option parsing into a separate function as preparation for reuse by the next commit. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions