X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=af6e3646ad32e04b552931b2249454dbb604ca84;hb=3868d189b3251aa7f0c307d14dbf5280d808d475;hp=cbdf292b2812e616248c06cfb8908374680d8c06;hpb=90c358cebcebc5facf68900ce7f1bbc263e71f1e;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index cbdf292b..af6e3646 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -531,7 +531,7 @@ This is provided mostly for the benefit of the test suite. Requests (more) debugging. May be repeated. -=item --experimntal-merge-resolution +=item --experimental-merge-resolution Enable experimental code for handling general merges (see L).