diff options
| author | Grégoire Paris <postmaster@greg0ire.fr> | 2014-05-06 23:29:57 +0200 |
|---|---|---|
| committer | Jean-Noel Avila <jn.avila@free.fr> | 2014-05-17 19:08:59 +0200 |
| commit | a6e888397ce46f9252ca89af46f3f6aaf18baf9b (patch) | |
| tree | da210eecd2d849e597f3b72f62a95b70743756de /merge.c | |
| parent | 6308767f0bb58116cb405e1f4f77f5dfc1589920 (diff) | |
| download | git-a6e888397ce46f9252ca89af46f3f6aaf18baf9b.tar.gz | |
fr: a lot of good fixups
Signed-off-by: Grégoire Paris <postmaster@greg0ire.fr>
Acked-by: Jean-Noel Avila <jn.avila@free.fr>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions