diff options
| author |  Marc Branchaud <marcnarc@xiplink.com> | 2010-04-12 12:28:13 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-04-12 09:50:09 -0700 |
| commit | adda3c3beb0a244719becb1895e16227b0393bd1 (patch) | |
| tree | 44b3268ee1379eddabd91fae67c1e71377659fae /ll-merge.h | |
| parent | Git 1.7.0.5 (diff) | |
| download | tgif-adda3c3beb0a244719becb1895e16227b0393bd1.tar.xz | |
Docs: Add -X option to git-merge's synopsis.
Also move -X's description next to -s's in merge-options.txt.
This makes it easier to learn how to specify merge strategy options.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions