diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-18 18:45:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-22 18:54:03 +0200 |
| commit | 360d3f3c187fa81ba583fd5a74704b09872937a6 (patch) | |
| tree | d11869e1e913ccb8ff85440d4347e66455d07241 /doc/libav-merge.txt | |
| parent | ebb9a320d707b4790328ce43fd0c65dc3f3f074b (diff) | |
| download | ffmpeg-360d3f3c187fa81ba583fd5a74704b09872937a6.tar.gz | |
doc&tools: Add murge script, for analyzing 3 way conflicts.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc/libav-merge.txt')
| -rw-r--r-- | doc/libav-merge.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 60c953a49f..4b2bb76471 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -103,6 +103,10 @@ It has two modes: merge, and noop. The noop mode creates a merge with no change to the HEAD. You can pass a hash as extra argument to reference a justification (it is common that we already have the change done in FFmpeg). +Also see tools/murge, you can copy and paste a 3 way conflict into its stdin +and it will display colored diffs. Any arguments to murge (like ones to suppress +whitespace differences) are passed into colordiff. + TODO/FIXME/UNMERGED =================== |