diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:07:50 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:07:50 -0700 |
| commit | 865156a7cb72a579c144220204fd7b447ca4e50f (patch) | |
| tree | 0e43d15116202baae9c558cfa3b27f9136712b2f /builtin/merge-recursive.c | |
| parent | Merge branch 'po/remote-set-head-usage' (diff) | |
| parent | howto/revert-a-faulty-merge: fix unescaped '^'s (diff) | |
| download | tgif-865156a7cb72a579c144220204fd7b447ca4e50f.tar.xz | |
Merge branch 'rj/doc-formatting-fix'
* rj/doc-formatting-fix:
howto/revert-a-faulty-merge: fix unescaped '^'s
howto/setup-git-server-over-http: fix unescaped '^'s
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions