debian/source/format
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 07 Jun 2018 22:45:54 +0530
changeset 3810 04fe01b0c0d0
parent 755 0021301f7fde
permissions -rw-r--r--
tests: add more test of resolution of content-divergent changesets This patch adds test of resolution of content-divergent changesets when relocation is required and it leads to conflicts. The test shows that we are not doing the right thing. This will be fixed in upcoming patches.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
755
0021301f7fde debian: add source/format file
Faheem Mitha <faheem@faheem.info>
parents:
diff changeset
     1
3.0 (quilt)